projects / apps / livebox / data-provider-master.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 88c80d0 b20f2aa)
Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:46:44 +0000 (12:46 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:46:44 +0000 (12:46 +0000)
Conflicts:
CMakeLists.txt
data/abi.ini
data/baltic.conf.ini
data/data-provider-master
data/private.conf.ini
include/conf.h
include/instance.h
include/script_handler.h
packaging/data-provider-master.spec
src/conf.c
src/instance.c
src/main.c
src/script_handler.c
src/server.c
src/slave_life.c
src/slave_rpc.c

Change-Id: I10405acdc4a1f1f02372f141d328335275fe36dd


Trivial merge
Domain: Applications / Uncategorized;