device-mgt-plugins/components/device-mgt/org.wso2.carbon.device.mgt.core
harshanL 1d94f81ec6 Merge branch 'master' of https://github.com/geethkokila/product-cdm
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dto/Device.java
2014-12-09 17:37:32 +05:30
..
src Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-09 17:37:32 +05:30
pom.xml fixing merge conflicts 2014-12-08 18:55:04 +05:30