merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:12:49 +0000 (01:12 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:12:49 +0000 (01:12 +0900)
commit583ee537e9299abcf0af28208467d6d0a22e5279
tree8c00973c57a791b2ed8452839133373861b93206
parente38ab91609f6a4cedc0a238a0e2421900825a768
merge with master
13 files changed:
CMakeLists.txt
include/vconf-internal-ail-keys.h [new file with mode: 0644]
include/vconf-internal-appservice-keys.h [new file with mode: 0755]
include/vconf-internal-isf-keys.h [new file with mode: 0644]
include/vconf-internal-keys.h
include/vconf-internal-menuscreen-keys.h
include/vconf-internal-pm-keys.h
include/vconf-internal-setting-keys.h
include/vconf-internal-sysman-keys.h
include/vconf-internal-telephony-keys.h
include/vconf-internal-usb-keys.h
include/vconf-internal-wifi-keys.h
packaging/vconf-internal-keys.spec