merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:49 +0000 (01:04 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:49 +0000 (01:04 +0900)
commitd9fbd1b14b2b312d6123386c24f75ddd18632db0
tree63bfdf72f4ecfb7433ccc3868bbf2617de9548b4
parent99bf0f56cf681728d963cc651e8339183d40c438
merge with master
47 files changed:
debian/changelog
org.tizen.setting.png [changed mode: 0755->0644]
packaging/org.tizen.setting.spec
resource/icons/A01-1_icon_About_phone.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Accounts.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Bluetooth.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Date_and_time.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Display.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Driving_mode.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Events_Notifications.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Flight_Mode.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Kies_via_Wifi.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Location.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Manage_Application.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Memory.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Menu.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Motion.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Network.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Power_saving_mode.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Reset.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Rotation_lock.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Security.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Sound.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_USB_Connection.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_USB_Theme.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Wi-Fi.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_Wi-Fi_direct.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_keyboard.png [changed mode: 0755->0644]
resource/icons/A01-1_icon_mobileAP.png [changed mode: 0755->0644]
resource/icons/Accessibility.png [changed mode: 0755->0644]
resource/icons/AllShare.png [changed mode: 0755->0644]
resource/icons/DefaultIcon.png [changed mode: 0755->0644]
resource/langlist.xml
setting-about/src/setting-about-main.c
setting-datausage/CMakeLists.txt [deleted file]
setting-datausage/include/setting-datausage-change-cycle.h [deleted file]
setting-datausage/include/setting-datausage-main.h [deleted file]
setting-datausage/include/setting-datausage-more-setting.h [deleted file]
setting-datausage/include/setting-datausage.h [deleted file]
setting-datausage/src/setting-datausage-change-cycle.c [deleted file]
setting-datausage/src/setting-datausage-main.c [deleted file]
setting-datausage/src/setting-datausage-more-setting.c [deleted file]
setting-datausage/src/setting-datausage.c [deleted file]
setting-display/include/setting-display.h
setting-network/src/setting-network.c
setting-storage/src/setting-storage-main.c
src/po/CMakeLists.txt