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)
commitaeab55acb07190152e9fc85adeb3a5e4db23c24b
treeb95c5c251398a5c599be44fc97cb76fa639d8332
parent8f533e90a890be380dcd3497991d02b7e5bf292f
parente5e378e19d61327c721f4f922c8f056a2b22c371
Merge Teamforge ccf-resource repo onto OIC oic-resource repo.

Merge remote-tracking branch 'oic/master' into oic-merge

Conflicts:
csdk/stack/test/linux/Makefile
csdk/makefile
csdk/stack/test/arduino/makefile