Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/apps/home/settings into tizen_2.1
authorMyoungJune Park <mj2004.park@samsung.com>
Thu, 9 May 2013 04:56:01 +0000 (13:56 +0900)
committerMyoungJune Park <mj2004.park@samsung.com>
Thu, 9 May 2013 04:56:01 +0000 (13:56 +0900)
commitb272dddd69ca090fa5b60def9b34f88ee69bed6c
tree0b24a7bc5be826a6cd4a408018627c29c28db264
parentbcb6ced53f915d2e66ae70c4e3c81355b3ea3907
parent1563650e26bbe4dce0acce243ef9c6b2acba1758
Merge branch 'tizen_2.1' of ssh://tizendev.org:29418/apps/home/settings into tizen_2.1
setting-about/include/setting-about-main.h
setting-about/src/setting-about-main.c
setting-common/src/setting-common-data-slp-setting.c