Merge Conflict resolved.
[framework/uifw/elementary.git] / data / objects / test.edc
2011-02-24 Prince Kr DubeyMerge Conflict resolved.
2011-01-11 WooHyun JungRevert to the original state
2011-01-11 WooHyun JungRepackage for fixing bug of elm_pager
2011-01-11 WooHyun JungRevert back to Original State (Merged Elementary)
2011-01-11 WooHyun Jung[
2011-01-10 Daniel Juyung Seo==================================================...
2010-10-23 Daniel Juyung SeoMerge branch 'master' of 165.213.180.234:/git/slp/pkgs...
2010-10-13 Hyoyoung ChangMerge branch 'master' of 165.213.180.234:/git/slp/pkgs...
2010-10-13 sumanth.mMerge branch 'master' of 165.213.180.234:/git/slp/pkgs...
2010-10-13 sumanth.msvn code merge (ver: 51860-51890)
2010-10-08 shilpa singhMerge branch 'master' of 165.213.180.234:/git/slp/pkgs...
2010-10-08 shilpa singh[svn 51793]: test.edc:
2010-05-18 Youmin Hasvn update: 48945 (latest:48959)