Jan Bartel c5fe3bcfd3 Merge remote-tracking branch 'origin/master' into jetty-9.1 ... Conflicts: jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java		2013-10-21 17:27:45 +11:00
..
src/main/java/org/eclipse/jetty/maven/plugin	Merge remote-tracking branch 'origin/master' into jetty-9.1	2013-10-21 17:27:45 +11:00
.gitignore	adding in jetty-maven-plugin	2012-08-28 09:35:45 -05:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2013-09-30 14:46:09 -05:00