jetty.project/jetty-annotations
Jan Bartel bd1b19b45c Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
2013-08-08 14:24:19 +10:00
..
src Merge remote-tracking branch 'origin/jetty-8' 2013-08-08 14:24:19 +10:00
pom.xml Merge remote-tracking branch 'origin/jetty-8' 2013-08-08 14:24:19 +10:00