projects / platform / framework / web / livebox-viewer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bf0531 b0d8dae)
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)
Conflicts:
include/livebox.h
packaging/liblivebox-viewer.spec
src/client.c
src/livebox.c

Change-Id: I050dcac2812c1c85d7a12e3589304b02d78dad66


Trivial merge
Domain: Web Framework / Uncategorized;