Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
jetty.project/jetty-osgi
History
Greg Wilkins 4e4ffaa54c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 		2013-06-17 16:29:39 +10:00
..
jetty-osgi-boot Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 16:29:39 +10:00
jetty-osgi-boot-jsp Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 16:29:39 +10:00
jetty-osgi-boot-logback [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
jetty-osgi-boot-warurl Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 16:29:39 +10:00
jetty-osgi-equinoxtools [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
jetty-osgi-httpservice Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 16:29:39 +10:00
jetty-osgi-npn [maven-release-plugin] prepare for next development iteration 2013-05-06 18:13:04 -05:00
jetty-osgi-servletbridge [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
test-jetty-osgi Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 16:29:39 +10:00
test-jetty-osgi-context Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 16:29:39 +10:00
test-jetty-osgi-webapp Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 16:29:39 +10:00
pom.xml Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 16:29:39 +10:00