cloudstack/ui/scripts/ui
Alena Prokharchyk a39fd61249 Merge branch 'master' into vpc
Conflicts:
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineGuru.java
2012-07-27 13:47:46 -07:00
..
widgets Merge branch 'master' into vpc 2012-07-27 13:47:46 -07:00
core.js CS-15325: Fix selected name of user from the drop down list overlay. 2012-07-27 16:27:59 +03:00
dialog.js CS-15292: Split long OS Type list when create Template,ISO. 2012-07-25 12:05:05 +03:00
events.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00
utils.js applying Chip Childer's patches for license headers in the ui directory 2012-06-26 10:46:53 -04:00