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-annotations
History
Jan Bartel 06ef5b7930 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
 		2013-08-09 15:59:29 +10:00
..
src Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-09 15:59:29 +10:00
pom.xml Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-08 14:31:33 +10:00