Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
jetty.project/jetty-http/src
History
Jan Bartel 02a66a00fb Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
	pom.xml
 		2011-08-01 14:39:39 +10:00
..
main Merge remote-tracking branch 'origin/master' into jetty-8 2011-08-01 14:39:39 +10:00
test/java/org/eclipse/jetty/http Merge remote-tracking branch 'origin/master' into jetty-8 2011-07-25 17:42:30 +10:00