bfederle c8f72c9198 Merge branch 'master' into vpc ...

Conflicts:
	ui/scripts/network.js

2012-07-23 10:36:25 -07:00

..

bindir

Bug 9479 - provide option for built in https

2011-09-01 17:09:06 -07:00

distro

cleaning up a few last license headers in client

2012-07-20 14:02:24 -04:00

tomcatconf

Merge branch 'master' into vpc

2012-07-23 10:36:25 -07:00

WEB-INF

CS-15388: Fix labels

2012-07-06 10:27:09 -07:00

.classpath

fixed all the broken thirdparty stuff

2011-01-31 10:51:01 -08:00

.project

change client/.project to client not vmopsClient

2011-09-22 13:37:12 -07:00