Merge branch 'master' into windows-port
[platform/upstream/iotivity.git] / resource / src / OCApi.cpp
2016-06-02 David AntlerMerge branch 'master' into windows-port
2016-06-02 David AntlerVS2013/15 aggregate changes of Intel and Microsoft
2014-11-06 William R. DieterRepo Merge: Moving resource API down a directory