Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

This commit is contained in:
Joakim Erdfelt 2012-07-20 11:49:31 -07:00
commit 547cd4e142
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
target/
*/src/main/java/META-INF/
*.versionsBackup
bin/
# common junk
*.log

View File

@ -3,7 +3,7 @@
<parent>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-parent</artifactId>
<version>19</version>
<version>20-SNAPSHOT</version>
</parent>
<artifactId>jetty-project</artifactId>
<version>9.0.0-SNAPSHOT</version>