jetty.project/jetty-osgi
Joakim Erdfelt 6e952d4618 Merge branch 'jetty-9.2.x'
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-start/src/test/java/org/eclipse/jetty/start/LicensingTest.java
2015-03-16 10:25:15 -07:00
..
jetty-osgi-alpn [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
jetty-osgi-boot [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
jetty-osgi-boot-jsp [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
jetty-osgi-boot-warurl [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
jetty-osgi-httpservice [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
test-jetty-osgi Merge branch 'jetty-9.2.x' 2015-03-16 10:25:15 -07:00
test-jetty-osgi-context [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
test-jetty-osgi-webapp [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
pom.xml [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00