projects / platform / framework / web / livebox-service.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7a09de6 933aa51)
Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:01:56 +0000 (13:01 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:01:56 +0000 (13:01 +0000)
Conflicts:
include/util.h
packaging/liblivebox-service.spec
src/livebox-service.c
src/util.c

Change-Id: I77c84462bc45b95016b8af4754a1b433d607dd7d


Trivial merge
Domain: Web Framework / Uncategorized;