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)
commit5c99f01c85522940a6bb84066b3fe4fa5f280aa4
tree8ee5b5a4f375c24d9e4494e943a588b7fe55e5f4
parent3169896c0735e75ca9832712657e884238f96879
parent7e4cfb3451450f8f64804e8c02f8e2ec15fe08b9
Merge branch 'master' into tizen_2.1

Conflicts:
TC_gui/main.c
capi-system-system-settings.pc.in
debian/changelog
packaging/capi-system-system-settings.spec
src/system_setting_platform.c