projects / platform / framework / web / data-provider-slave.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f9a406 8385f2b)
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/data-provide... submit/tizen/20131022.035939
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 03:43:10 +0000 (12:43 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 03:43:10 +0000 (12:43 +0900)
commitaa2246206ae09bd994f7eb2c66af7cac86a0ace0
tree3d99a707652dd1b58a4b218d9069b74f0cb7e424tree | snapshot
parent9f9a40690c0cc75dd6e1bac1ca95cb4793cbbd98commit | diff
parent8385f2b5c9dcfa27ac20d30bf57a3582c37dd023commit | diff
Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/data-provider-slave into work

Sync with the latest tizen 2.2 implementations

Conflicts:
src/main.c

Change-Id: Icd431d2b9d12006a33e70ee0056542a534d1e5ff
CMakeLists.txt diff1 | diff2 | blob | history
packaging/org.tizen.data-provider-slave.spec diff1 | diff2 | blob | history
Domain: Web Framework / Uncategorized;