Vijayendra Bhamidipati 46fba35c99 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x ... Conflicts: core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java		2012-08-02 22:53:51 -04:00
..
src/com/cloud	Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x	2012-08-02 22:53:51 -04:00
test/com/cloud	Add support routines for incremental snapshot support	2012-05-11 17:06:35 -07:00
.classpath	fixed eclipse classpath	2011-08-31 13:35:37 -07:00
.project	revert un neccessary changes	2010-09-29 18:40:52 -07:00