Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:04:21 +0000 (13:04 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:04:21 +0000 (13:04 +0000)
commit493983049307c5b59afd0062b1eec5559882a131
tree7fdcc3864c8190bb560fb2241fd9760b58b875df
parent0bf0531e4b5d4bf54fd55ddd66253ad38bb4e2e6
parentb0d8dae7b3ff19a6a9e5ccde84e0053ea2162f11
Merge branch 'master' into tizen_2.1

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

Change-Id: I050dcac2812c1c85d7a12e3589304b02d78dad66