projects / platform / upstream / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ed0944 68f434c)
Merge "scons changes for connectivity-abstraction branch" into connectivity-abstraction
authorSudarshan Prasad <sudarshan.prasad@intel.com>
Thu, 25 Dec 2014 00:11:13 +0000 (00:11 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 25 Dec 2014 00:11:13 +0000 (00:11 +0000)
1  2 
resource/csdk/SConscript patch | diff1 | diff2 | blob | history
resource/examples/SConscript patch | diff1 | diff2 | blob | history

diff --cc resource/csdk/SConscript
Simple merge
diff --cc resource/examples/SConscript
Simple merge
Domain: Network & Connectivity / IoT Connectivity;