Merge "Merge branch 'master' into resource-manipulation" into resource-manipulation
[platform/upstream/iotivity.git] / resource / csdk / stack / samples / linux / SimpleClientServer / ocserverbasicops.h
2015-04-10 Erich KeaneMerge branch 'connectivity-abstraction' to master
2015-03-18 Sakthivel SamiduraiChangeset for reviewing RI-CA integration changes.
2014-12-15 Uze ChoiMerge "There are Two modifications. 1. Restucturing...
2014-12-08 Sudarshan PrasadMerge branch 'master' into connectivity-abstraction
2014-12-05 sudarshan prasadMerge "Implement functionality to set PSK credentials...
2014-12-04 Doug HudsonImplement slow response feature.
2014-11-06 William R. DieterRepo Merge: Moving resource API down a directory