Merge ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox/livebox into tizen_2.3
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Nov 2014 05:57:52 +0000 (14:57 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 13 Nov 2014 05:57:52 +0000 (14:57 +0900)
commit4d87ee775e0dacee07785be9b0e88e89293ffa18
treef682f65c6de9befb290d9abd5b456a010f9064c6
parenta8ab0fecc126187f98eb8bd9f072ea26dcf2f27b
parent6437a6a00e7ed2b2b7348b0f2e2b13826b636bdc
Merge ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox/livebox into tizen_2.3

Conflicts:
packaging/libdynamicbox.spec
src/virtual_window.c

Sync with the latest private

Change-Id: I654425efb67b9ae208530e0855159905eb75bc6b