Merge "Merge branch 'security-CKM' into 'master'"
[platform/upstream/iotivity.git] / service / simulator / java / sdk / src / org / oic / simulator / PlatformInfo.java
2015-09-19 Sachin AgrawalMerge "Merge branch 'security-CKM' into 'master'"
2015-09-19 Harish Kumara MarappaMerge branch 'simulator'
2015-09-19 Harish Kumara MarappaFix for prevent tool reported defects.
2015-09-18 Harish Kumara MarappaMerge branch 'master' into simulator
2015-09-16 G S Senthil KumarJava SDK and Eclipse plugin for simulator.