Greg Wilkins 325c484950 fixed merge issues

2012-04-12 17:16:45 +10:00

..

jetty-osgi-boot

fixed merge issues

2012-04-12 17:16:45 +10:00

jetty-osgi-boot-jsp

Merge remote-tracking branch 'origin/master' into jetty-8

2012-04-12 16:02:34 +10:00

jetty-osgi-boot-logback/META-INF

Update version in MANIFESTs

2012-04-04 15:13:02 +10:00

jetty-osgi-boot-warurl

Merge remote-tracking branch 'origin/master' into jetty-8

2012-04-12 16:02:34 +10:00

jetty-osgi-equinoxtools/META-INF

Update version in MANIFESTs

2012-04-04 15:13:02 +10:00

jetty-osgi-httpservice

Merge remote-tracking branch 'origin/master' into jetty-8

2012-04-12 16:02:34 +10:00

jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge

Revert "Merge branch 'release-8'"

2011-11-30 16:27:30 +11:00

test-jetty-osgi

[maven-release-plugin] prepare for next development iteration

2012-03-08 23:53:50 -06:00

pom.xml

[maven-release-plugin] prepare for next development iteration

2012-03-08 23:53:50 -06:00