jetty.project/jetty-osgi
Greg Wilkins 1159111c52 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2014-11-27 13:34:45 +11:00
..
jetty-osgi-alpn [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
jetty-osgi-boot Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-11-19 13:37:48 +11:00
jetty-osgi-boot-jsp Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-11-27 13:34:45 +11:00
jetty-osgi-boot-warurl [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
jetty-osgi-httpservice [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
jetty-osgi-npn [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
test-jetty-osgi Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-11-19 13:37:48 +11:00
test-jetty-osgi-context [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
test-jetty-osgi-webapp [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
pom.xml [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00