jetty.project/jetty-xml
Jan Bartel 93cc111a02 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
2011-07-25 17:42:30 +10:00
..
src Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-07-15 15:21:23 +10:00
pom.xml [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00