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

Browse Source

Conflicts:
	VERSION.txt
	jetty-distribution/src/main/resources/bin/jetty.sh
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml

...

This commit is contained in:

Greg Wilkins 2013-03-14 12:44:33 +11:00

parent 9397ba8782 1cb201ef14

commit 489220d6b4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available