Merge branch 'easysetup'
[platform/upstream/iotivity.git] / service / resource-container / src / org_iotivity_resourcecontainer_bundle_api_BaseActivator.h
2015-11-12 lankamadanMerge branch 'master' into easysetup
2015-10-12 Harish Kumara MarappaMerge branch 'master' into simulator
2015-10-05 Joseph MorrowMerge branch 'plugin-interface' into master
2015-09-30 Jon A. CruzMerge "Merge Resource Directory into the master"
2015-09-30 Minji Parkchange location of resource container directory