Merge branch 'devel/home/master' of ssh://slp-info.sec.samsung.net:29418/magnolia...
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Nov 2014 05:59:05 +0000 (14:59 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Nov 2014 05:59:05 +0000 (14:59 +0900)
commitfdcb668d489be18b29f64d928d8dc65f8613f5b4
tree3e3127f6c7aab4eb0c70812fa7698da2ced4a363
parentf8e60a741c585476c34d5d37bf85e566d8b15873
parent17b0bb349e54c62effae240e26da87ac892ad18c
Merge branch 'devel/home/master' of ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox/livebox-edje into tizen_2.3

Conflicts:
packaging/libdynamicbox_edje.spec

Sync with the latest pivate repository

Change-Id: I051cbe5c5e2fd2ae214b47ebe1c9bbc241db56f6