Google Git
Sign in
eclipse/virgo/org.eclipse.virgo.web/refs/heads/jetty-support
commit
22a77a60bb9e2fcf3fe8ad46aab6a6b84e15d7ed
[log]
author
Christopher Frost <frostc@vmware.com>
Thu Feb 03 16:58:14 2011 +0000
committer
Christopher Frost <frostc@vmware.com>
Thu Feb 03 16:58:14 2011 +0000
tree
9ccb65f350224d1c0dd2ceffc72e0e869ecfb347
parent
b27e5b6bffe449357d6917876ca875101594de5a [diff]
parent
6ad418729fe02896a89da1399f65d080c6f642a1 [diff]
Merge branch 'master' into jetty-support

Conflicts:
	org.eclipse.virgo.web.core/.classpath
	org.eclipse.virgo.web.core/ivy.xml
	org.eclipse.virgo.web.tomcat/.classpath
	org.eclipse.virgo.web/src/org.eclipse.virgo.web.plan
tree: 9ccb65f350224d1c0dd2ceffc72e0e869ecfb347
  1. build-web/
  2. org.eclipse.virgo.web/
  3. org.eclipse.virgo.web.core/
  4. org.eclipse.virgo.web.dm/
  5. org.eclipse.virgo.web.test/
  6. org.eclipse.virgo.web.tomcat/
  7. test-apps/
  8. virgo-build
  9. .gitignore
  10. .gitmodules
  11. build.properties
  12. build.versions
  13. java6-server.profile