jetty.project/jetty-deploy/src
Greg Wilkins 06d3fbe5aa Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
2013-06-11 14:07:00 +10:00
..
main Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
test Merge remote-tracking branch 'origin/jetty-8' 2013-06-11 14:07:00 +10:00