jetty.project/jetty-osgi
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
..
jetty-osgi-boot Merge remote-tracking branch 'origin/master' into jetty-8 2011-07-25 17:42:30 +10:00
jetty-osgi-boot-jsp [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
jetty-osgi-boot-warurl [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
jetty-osgi-httpservice [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
test-jetty-osgi [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00
pom.xml [maven-release-plugin] prepare for next development iteration 2011-07-07 18:43:56 -05:00