Merge branch 'devel/home/master'
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 15 Jul 2014 08:42:17 +0000 (17:42 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 15 Jul 2014 08:42:17 +0000 (17:42 +0900)
commitaf6fa19ff254588ba053366a7125a22c111e3f8d
treed2448fcd5a4b14c109ddfba7c58edc0e088f97cd
parente2d1978cfb5dd2b33cc61bb3a4266aeae9ab9aaf
parent2bf27317e7d0ef92c3924e307811bd923c4921e9
Merge branch 'devel/home/master'

Conflicts:
include/livebox.h
packaging/liblivebox-viewer.spec

Change-Id: I2801b3f52f34223c09a0d9c5fe5f398480559bc1