merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:41 +0000 (01:16 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:41 +0000 (01:16 +0900)
commit381e6d41ed972ce4cb848563e021c3f9411f9717
tree423b228462efeafc7a50efb6e96800c6b6f69442
parent6852bef2dafc2fb60d5e549f680164960ec55a3c
merge with master
29 files changed:
CMakeLists.txt
LICENSE.APLv2.0 [changed mode: 0644->0755]
inc/BluetoothConnectivityIpcStub.h
inc/BluetoothService.h
inc/NetConnectivityIpcStub.h
inc/NetService.h
inc/NfcConnectivityIpcStub.h
inc/NfcMessagePushDelegate.h
inc/NfcMessageRegisterService.h
inc/NfcService.h
inc/WifiConnectivityIpcStub.h
inc/WifiProximityService.h
inc/WifiService.h
manifest.xml
osp-connectivity-service.manifest
osp-connectivity-service.rule [new file with mode: 0644]
packaging/osp-connectivity-service.spec
src/BluetoothConnectivityIpcStub.cpp
src/BluetoothService.cpp
src/NetConnectivityIpcStub.cpp
src/NetService.cpp
src/NfcConnectivityIpcStub.cpp
src/NfcMessagePushDelegate.cpp
src/NfcMessageRegisterService.cpp
src/NfcService.cpp
src/TelephonyService.cpp
src/WifiConnectivityIpcStub.cpp
src/WifiProximityService.cpp
src/WifiService.cpp