projects / platform / core / api / tethering.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c087a58 62567b9)
Merge branch 'master' into tizen_2.1
authorSeungyoun Ju <sy39.ju@samsung.com>
Tue, 9 Apr 2013 10:48:09 +0000 (19:48 +0900)
committerSeungyoun Ju <sy39.ju@samsung.com>
Tue, 9 Apr 2013 10:48:13 +0000 (19:48 +0900)
Conflicts:
CMakeLists.txt
include/marshal.list
include/tethering.h
include/tethering.xml
include/tethering_private.h
packaging/capi-network-tethering.spec
src/tethering.c
src/tethering_client.c

Change-Id: If2ba3a5650b604fc9f676dffc9d0961917fcaf36


Trivial merge
Domain: Network & Connectivity / Data Network;