asok 877ef213e1 Merge branch 'master' of https://github.com/geethkokila/product-cdm ... Conflicts: product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/applicationContext.xml product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_cert.pem product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_private.key product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/discover-service.xml product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/enrollment-service.xml product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/log4j.xml product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/policy-service.xml product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/wap-provisioning.xml product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/windows-mdm-server.properties		2015-01-21 10:51:53 +05:30
..
agents	Merge branch 'master' of https://github.com/geethkokila/product-cdm	2015-01-21 10:51:53 +05:30
pom.xml	Refactor Agents module	2015-01-20 11:42:32 +05:30