projects / contrib / iotivity.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f533e9 e5e378e)
Merge Teamforge ccf-resource repo onto OIC oic-resource repo.
authorJoseph Morrow <joseph.l.morrow@intel.com>
Fri, 15 Aug 2014 14:26:45 +0000 (10:26 -0400)
committerJoseph Morrow <joseph.l.morrow@intel.com>
Fri, 15 Aug 2014 14:26:45 +0000 (10:26 -0400)
Merge remote-tracking branch 'oic/master' into oic-merge

Conflicts:
csdk/stack/test/linux/Makefile

1  2 
csdk/makefile patch | diff1 | diff2 | blob | history
csdk/stack/test/arduino/makefile patch | diff1 | diff2 | blob | history

diff --cc csdk/makefile
Simple merge
diff --cc csdk/stack/test/arduino/makefile
Simple merge
Domain: SCM / Uncategorized;