merge master code to build iotivity
[platform/upstream/iotivity.git] / resource / csdk / security / include / internal / srmresourcestrings.h
2015-08-25 hyuna0213.jomerge master code to build iotivity
2015-07-16 hunje.yeonMerge branch 'master' into resource-manipulation
2015-07-15 Sachin AgrawalMerge "Merge 'security-basecamp' branch into master...
2015-07-15 Sachin AgrawalMerge 'security-basecamp' branch into master with CBOR
2015-07-14 Sachin AgrawalImproved OIC Virtual Resource definitions (IOT-603)
2015-07-12 Nathan Heldt-ShellerFixed Secure Resource Mgr Policy Engine to allow for...
2015-06-17 Uze ChoiMerge "Merge branch 'master' into resource-manipulation...
2015-06-17 hunje.yeonMerge branch 'master' into resource-manipulation
2015-06-15 Sachin AgrawalAdded REST query parser
2015-06-11 hunje.yeonMerge branch 'master' into resource-manipulation
2015-06-04 Sachin AgrawalMerging security-M3 to master