projects / platform / framework / native / app-controls.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4eaf9e4) | patch
merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:14 +0000 (01:16 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:14 +0000 (01:16 +0900)
commitb449473bcc484b1b139a50e40802606eba7fefa9
treebd01cf7fcf253ae4625f0a63722ac6ab06a5a7e1tree | snapshot
parent4eaf9e46032abb60a8ea418751ac5d81d8fbf6f1commit | diff
merge with master
25 files changed:
CMakeLists.txt diff | blob | history
packaging/osp-app-controls.spec diff | blob | history
res/arm/usr/etc/app-control-alias.ini [deleted file] blob | history
res/arm/usr/etc/app-control-appid.ini [deleted file] blob | history
res/x86/usr/etc/app-control-alias.ini [deleted file] blob | history
res/x86/usr/etc/app-control-appid.ini [deleted file] blob | history
res/x86/usr/etc/app-control-info.ini [deleted file] blob | history
src/bluetooth-app-control/BluetoothAppControlDllEntry.cpp diff | blob | history
src/camera-app-control/CameraAppControlDllEntry.cpp diff | blob | history
src/contact-app-control/ContactAppControlDllEntry.cpp diff | blob | history
src/nfc-push-ui-app-control/CMakeLists.txt [new file with mode: 0755] blob
src/nfc-push-ui-app-control/data/dummy.file [new file with mode: 0644] blob
src/nfc-push-ui-app-control/inc/NfcPushUi.h [new file with mode: 0644] blob
src/nfc-push-ui-app-control/inc/NfcPushUiForm.h [new file with mode: 0644] blob
src/nfc-push-ui-app-control/inc/NfcPushUiFrame.h [new file with mode: 0644] blob
src/nfc-push-ui-app-control/manifest.xml [new file with mode: 0644] blob
src/nfc-push-ui-app-control/nfc-push-ui-app-control.manifest [new file with mode: 0644] blob
src/nfc-push-ui-app-control/res/icon.png [new file with mode: 0644] blob
src/nfc-push-ui-app-control/shared/res/screen-density-xhigh/mainmenu.png [new file with mode: 0644] blob
src/nfc-push-ui-app-control/src/NfcPushUi.cpp [new file with mode: 0644] blob
src/nfc-push-ui-app-control/src/NfcPushUiEntry.cpp [new file with mode: 0644] blob
src/nfc-push-ui-app-control/src/NfcPushUiForm.cpp [new file with mode: 0644] blob
src/nfc-push-ui-app-control/src/NfcPushUiFrame.cpp [new file with mode: 0644] blob
src/nfc-push-ui-app-control/system-service-export.ver [new file with mode: 0755] blob
src/setting-app-control/SettingAppControlDllEntry.cpp diff | blob | history
Domain: App Framework / Uncategorized;