device-mgt-core/components/device-mgt
manoj d790d343a9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementServiceImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java
2015-03-20 12:32:50 +05:30
..
org.wso2.carbon.device.mgt.common Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-20 12:32:50 +05:30
org.wso2.carbon.device.mgt.core Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-03-20 12:32:50 +05:30
pom.xml [maven-release-plugin] prepare for next development iteration 2015-02-24 14:29:34 +05:30