projects / platform / core / api / system-settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3169896 7e4cfb3)
Merge branch 'master' into tizen_2.1
authorMyoungJune Park <mj2004.park@samsung.com>
Tue, 26 Mar 2013 02:06:11 +0000 (11:06 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Tue, 26 Mar 2013 02:06:11 +0000 (11:06 +0900)
Conflicts:
TC_gui/main.c
capi-system-system-settings.pc.in
debian/changelog
packaging/capi-system-system-settings.spec
src/system_setting_platform.c


Trivial merge
Domain: System / Base;