mharindu c68b92c7b4 Fixed conflicts		2016-05-16 14:12:28 +05:30
..
org.wso2.carbon.device.mgt.analytics.dashboard	Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature	2016-05-11 20:01:02 +05:30
org.wso2.carbon.device.mgt.analytics.data.publisher	fixes after testing	2016-05-12 02:42:29 +05:30
org.wso2.carbon.device.mgt.api	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-16 11:55:35 +05:30
org.wso2.carbon.device.mgt.common	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport	2016-05-13 15:03:11 +05:30
org.wso2.carbon.device.mgt.core	Fixed conflicts	2016-05-16 14:12:28 +05:30
org.wso2.carbon.device.mgt.extensions	changing profile name	2016-05-15 01:35:57 +05:30
org.wso2.carbon.device.mgt.ui	Merge pull request #254 from ayyoob/transport	2016-05-15 20:07:02 +05:30
pom.xml	removed unused code and resolved host issues	2016-05-04 01:19:56 +05:30