Rohit Yadav 85e73a640e Merge branch 'master' into api_refactoring ... Conflicts: client/tomcatconf/commands.properties.in Signed-off-by: Rohit Yadav <bhaisaab@apache.org>		2013-01-03 23:27:42 -08:00
..
WEB-INF	CLOUDSTACK-646: Cleaning up Citrix/eula/CloudPlatform references	2012-12-16 20:39:03 -08:00
bindir	License header update for the client folder	2012-08-01 13:49:10 -04:00
distro	debian: Update locations where to search for Java under Ubuntu and Debian	2012-09-11 15:22:17 +02:00
tomcatconf	Merge branch 'master' into api_refactoring	2013-01-03 23:27:42 -08:00
cloudstack-ui.launch	client: Re-add missing license header in client/cloudstack-ui.launch	2012-12-23 02:47:27 -08:00
pom.xml	plugin: ACL Static Role Based api access checker	2013-01-02 17:06:19 -08:00