merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:05 +0000 (01:17 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:17:05 +0000 (01:17 +0900)
commit5edcc5b9260929c324077c35acceb5e47bc4c74d
tree763b613e6554a4d8775ef4b9cebda6333b6c3e6f
parent683ce74ca91fab11127dfff08e95afcdc2cbc69d
merge with master
76 files changed:
inc/FNetDns.h
inc/FNetHttpHttpAuthentication.h
inc/FNetHttpHttpCookieStorageManager.h
inc/FNetHttpHttpCredentials.h
inc/FNetHttpHttpSession.h
inc/FNetHttpHttpTransaction.h
inc/FNetHttpHttpTypes.h
inc/FNetHttpIHttpTransactionEventListener.h
inc/FNetIp4Address.h [changed mode: 0644->0755]
inc/FNetNetAccountInfo.h [changed mode: 0644->0755]
inc/FNetNetAccountManager.h
inc/FNetNetConnection.h
inc/FNetNetConnectionManager.h
inc/FNetNetStatistics.h
inc/FNetNetTypes.h
inc/FNetSockSecureSocket.h
inc/FNetSockSocket.h
inc/FNetSockSocketUtility.h
inc/FNetWifiIWifiDirectDeviceListener.h
inc/FNetWifiIWifiSystemMonitoringEventListener.h
inc/FNetWifiWifiBssInfo.h
inc/FNetWifiWifiDirectDevice.h
inc/FNetWifiWifiDirectGroupClient.h
inc/FNetWifiWifiDirectGroupOwner.h
inc/FNetWifiWifiManager.h
inc/FNetWifiWifiTypes.h
packaging/osp-net.spec
src/FNetNetStatistics.cpp
src/FNet_DefaultSystemNetConnection.cpp
src/FNet_LocalDhcpServerImpl.cpp
src/FNet_NetAccountDatabase.cpp
src/FNet_NetAccountDatabase.h
src/FNet_NetAccountInfoImpl.cpp
src/FNet_NetAccountManagerImpl.cpp
src/FNet_NetAccountManagerImpl.h
src/FNet_NetIpcProxy.cpp
src/FNet_NetIpcProxy.h
src/FNet_NetStatisticsImpl.cpp
src/FNet_PsSystemNetConnection.cpp
src/FNet_SystemNetConnection.cpp
src/http/FNetHttpHttpTransaction.cpp
src/http/FNetHttp_HttpCommon.cpp
src/http/FNetHttp_HttpDeleter.h
src/http/FNetHttp_HttpMultipleConnectionInfo.cpp
src/http/FNetHttp_HttpRequestImpl.cpp
src/http/FNetHttp_HttpSessionImpl.cpp
src/http/FNetHttp_HttpTransactionEvent.cpp
src/http/FNetHttp_HttpTransactionEvent.h
src/http/FNetHttp_HttpTransactionEventArg.cpp
src/http/FNetHttp_HttpTransactionEventArg.h
src/http/FNetHttp_HttpTransactionImpl.cpp
src/inc/FNetHttp_HttpCommon.h
src/inc/FNetHttp_HttpRequestImpl.h
src/inc/FNetHttp_HttpSessionImpl.h
src/inc/FNetHttp_HttpTransactionImpl.h
src/inc/FNetWifi_IWifiDirectListener.h
src/inc/FNetWifi_WifiDirectDeviceImpl.h
src/inc/FNet_ConnectivityIpcMessages.h
src/sockets/FNetSock_SecureSocketImpl.cpp
src/sockets/FNetSock_SecureSocketManagedNetConnectionEventListenerImpl.cpp
src/sockets/FNetSock_SocketImpl.cpp
src/wifi/FNetWifiWifiDirectDevice.cpp
src/wifi/FNetWifiWifiDirectDeviceManager.cpp
src/wifi/FNetWifiWifiManager.cpp
src/wifi/FNetWifi_WifiDirectDeviceEvent.cpp
src/wifi/FNetWifi_WifiDirectDeviceImpl.cpp
src/wifi/FNetWifi_WifiDirectDeviceInfoImpl.cpp
src/wifi/FNetWifi_WifiDirectEvent.cpp
src/wifi/FNetWifi_WifiDirectEventArg.h
src/wifi/FNetWifi_WifiDirectSystemAdapter.cpp
src/wifi/FNetWifi_WifiDirectSystemAdapter.h
src/wifi/FNetWifi_WifiNetAccountInfoImpl.cpp
src/wifi/FNetWifi_WifiSystemMonitoringEvent.cpp
src/wifi/FNetWifi_WifiSystemMonitoringEvent.h
src/wifi/FNetWifi_WifiSystemMonitoringEventArg.cpp
src/wifi/FNetWifi_WifiSystemMonitoringEventArg.h