Merge branch 'master' of ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox...
authorSung-jae Park <nicesj.park@samsung.com>
Wed, 26 Nov 2014 05:05:07 +0000 (14:05 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 26 Nov 2014 05:05:07 +0000 (14:05 +0900)
commitabd987c63bf483f15cfffa8f146ae588185d6ca7
tree148126f0981f777e9602ec9969087fb5a91db507
parentae2e9ed334e3ffa80ede57700dc754a5c7c70d85
parentaf0cdb6fa0a2cee256cfcddde1ca9a33d4212ed9
Merge branch 'master' of ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox/data-provider-master into tizen_2.3

Conflicts:
pkgmgr_dynamicbox/dynamicbox.xml

Change-Id: I2e4bd6ecd0eb119be934a1303e324b7cfb9a94ab
packaging/data-provider-master.spec