Merge Things Manager codes CA and Master branch.
[platform/upstream/iotivity.git] / service / things-manager / sampleapp / linux / configuration / ConfigurationCollection.h
2015-04-09 HyunJun KimMerge Things Manager codes CA and Master branch.
2014-12-25 Sudarshan PrasadMerge "scons changes for connectivity-abstraction branc...
2014-12-24 Sudarshan PrasadMerge "Updates occlientbasicops to include (resource...
2014-12-24 Sudarshan PrasadMerge "[CA-Integration] fix for presence." into connect...
2014-12-23 Sudarshan PrasadMerge "Remove the dead code" into connectivity-abstraction
2014-12-23 Sudarshan PrasadMerge from master to connectivity-abstraction branch