projects / platform / core / appfw / data-provider-master.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7465a4c 21362c5)
Merge branch 'tizen_2.3' into tizen_2.4
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 09:45:21 +0000 (18:45 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 26 May 2015 09:45:21 +0000 (18:45 +0900)
commitac15a5716fb531d3d4ae2e21ecc595723578319b
treee68fbfa52a384a5766d90d011bca229106ce1ed5tree | snapshot
parent7465a4ccab9bae16121af0f1680854f049c0d7cfcommit | diff
parent21362c5572e3ee3e6cb3643243a0b659c87e8971commit | diff
Merge branch 'tizen_2.3' into tizen_2.4

Conflicts:
packaging/data-provider-master.spec
src/notification_service.c

Change-Id: I6e054a277b3e74e4209347a7a0a544bd48daac50
src/slave_life.c diff1 | diff2 | blob | history
Domain: App Framework / Application Utility;