sinthuja 37a15e927d Merge branch 'wso2-master' ... # Conflicts: # features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml		2017-05-08 14:28:07 +05:30
..
org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature	Fixing the virtual fire alarm device types.	2017-05-04 21:41:34 +05:30
org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature	Fixing the ardino and raspberry device types.	2017-05-04 16:30:14 +05:30
org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature	Merge branch 'wso2-master'	2017-05-08 14:28:07 +05:30
pom.xml	Merge branch 'wso2-master'	2017-05-08 14:28:07 +05:30