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:07:02 +0000 (14:07 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 26 Nov 2014 05:07:02 +0000 (14:07 +0900)
commit256de405dfc6058f6ff1013aa48d2ef6d2a91fe1
tree80565fe70d2b54859cef48da78068fa1bd919453
parentbee69042b84da56e3ad7acd52de43cd966016383
parent7d4404d549dfa34146977a9ea63c2eb07088f43f
Merge branch 'master' of ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox/livebox into tizen_2.3

Conflicts:
packaging/libdynamicbox.spec

Change-Id: I8aa2aa7d70da8efe505691b4bd6842dbde084217
packaging/libdynamicbox.spec