projects / platform / framework / web / data-provider-slave.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5bd5d2 29c2552)
Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:56:03 +0000 (12:56 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:56:03 +0000 (12:56 +0000)
Conflicts:
include/conf.h
packaging/org.tizen.data-provider-slave.spec
src/conf.c

Change-Id: I9463462acc0442cafabb038a016b4ac8c7bf1d6f


Trivial merge
Domain: Web Framework / Uncategorized;