Merge branch '2.0_beta' of ssh://112.106.1.251:29418/framework/uifw/edje into 2.0_beta 2.0alpha master 2.0_alpha submit/master/20120920.151121 submit/master/20120920.151122
authorChunEon Park <chuneon.park@samsung.com>
Sat, 1 Sep 2012 07:19:24 +0000 (16:19 +0900)
committerChunEon Park <chuneon.park@samsung.com>
Sat, 1 Sep 2012 07:19:24 +0000 (16:19 +0900)
commit94427d6bc7d9cae5aeaa962d23f4de61c7f5b9d0
treeaa5d0b665eba79cb1faf75cfda3190958b1b2f6f
parentbc27b453eb003bb0770a4ae22024e2642296577a
parent467df6413f7a57e654b48c8a0a03e4e001b46034
Merge branch '2.0_beta' of ssh://112.106.1.251:29418/framework/uifw/edje into 2.0_beta