merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:06:20 +0000 (01:06 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:06:20 +0000 (01:06 +0900)
commitf8de4b6042220fd1677bd45f1929eee74408d07f
tree9cc4a1a4e87c3670da1bf5fc4fe69646e8ddb1b7
parente7228527a41dc0d12aeadbabff8d80dc89b7cbd5
merge with master
114 files changed:
inc/StAboutPhoneForm.h
inc/StAppSettingForm.h
inc/StBaseForm.h
inc/StBluetoothPresentationModel.h
inc/StFontForm.h
inc/StFontSizeForm.h
inc/StIBluetoothPresentationModelEventListener.h
inc/StLanguageAndRegionForm.h
inc/StLanguageForm.h
inc/StMainMenuForm.h
inc/StManageApplicationForm.h [new file with mode: 0644]
inc/StManageApplicationInfoForm.h [new file with mode: 0644]
inc/StMoreSystemForm.h
inc/StResourceManager.h
inc/StSettingScenesList.h
inc/StTypes.h
inc/StWallpaperAlbumInfo.h [new file with mode: 0644]
inc/StWallpaperAlbumListDetailForm.h [new file with mode: 0644]
inc/StWallpaperAlbumListForm.h [new file with mode: 0644]
inc/StWallpaperAlbumListPresentationModel.h [new file with mode: 0644]
inc/StWallpaperForm.h [new file with mode: 0644]
inc/StWallpaperImageSelectForm.h [new file with mode: 0644]
manifest.xml
packaging/apps.Settings.spec
res/ara-AE.xml
res/aze-AZ.xml
res/bul-BG.xml
res/cat-ES.xml
res/ces-CZ.xml
res/dan-DK.xml
res/deu-DE.xml
res/ell-GR.xml
res/eng-GB.xml
res/eng-PH.xml
res/eng-US.xml
res/est-EE.xml
res/eus-ES.xml
res/fin-FI.xml
res/fra-CA.xml
res/fra-FR.xml
res/gle-IE.xml
res/glg-ES.xml
res/hin-IN.xml
res/hrv-HR.xml
res/hun-HU.xml
res/hye-AM.xml
res/isl-IS.xml
res/ita-IT.xml
res/jpn-JP.xml
res/kat-GE.xml
res/kaz-KZ.xml
res/kor-KR.xml
res/lav-LV.xml
res/lit-LT.xml
res/mkd-MK.xml
res/nld-NL.xml
res/nob-NO.xml
res/pol-PL.xml
res/por-BR.xml
res/por-PT.xml
res/ron-RO.xml
res/rus-RU.xml
res/screen-density-xhigh/A01-1_Vibration_bar.png [new file with mode: 0644]
res/screen-density-xhigh/T01_main_folder_bg.png [new file with mode: 0644]
res/slk-SK.xml
res/slv-SI.xml
res/spa-ES.xml
res/spa-MX.xml
res/srp-RS.xml
res/swe-SE.xml
res/tur-TR.xml
res/ukr-UA.xml
res/uzb-UZ.xml
res/zho-CN.xml
res/zho-HK.xml
res/zho-SG.xml
res/zho-TW.xml
src/StAboutPhoneForm.cpp
src/StAppSettingForm.cpp
src/StAppSettingManager.cpp
src/StBaseForm.cpp
src/StBluetoothForm.cpp
src/StBluetoothPresentationModel.cpp
src/StCertificateUserForm.cpp
src/StCertificateUserInstallForm.cpp
src/StCertificateUserInstallPasswordForm.cpp
src/StDateTimeForm.cpp
src/StFontForm.cpp
src/StFontSizeForm.cpp
src/StFormFactory.cpp
src/StKeyboardInfoForm.cpp
src/StLanguageAndRegionForm.cpp
src/StLanguageForm.cpp
src/StLocationForm.cpp
src/StMainFrame.cpp
src/StMainMenuForm.cpp
src/StManageApplicationForm.cpp [new file with mode: 0644]
src/StManageApplicationInfoForm.cpp [new file with mode: 0644]
src/StMoreSystemForm.cpp
src/StNetworkForm.cpp
src/StRegionForm.cpp
src/StResourceManager.cpp
src/StSettingsApp.cpp
src/StTimeZoneForm.cpp
src/StTypes.cpp
src/StWallpaperAlbumInfo.cpp [new file with mode: 0644]
src/StWallpaperAlbumListDetailForm.cpp [new file with mode: 0644]
src/StWallpaperAlbumListForm.cpp [new file with mode: 0644]
src/StWallpaperAlbumListPresentationModel.cpp [new file with mode: 0644]
src/StWallpaperForm.cpp [new file with mode: 0644]
src/StWallpaperImageSelectForm.cpp [new file with mode: 0644]
src/StWifiApDetailForm.cpp
src/StWifiConnectionForm.cpp
src/StWifiForm.cpp