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/jetty-osgi-boot
History
Jan Bartel 93cc111a02 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	VERSION.txt
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
 		2011-07-25 17:42:30 +10:00
..
META-INF Merge of jetty-7 into jetty-8 2011-07-11 12:05:58 +10:00
jettyhome Merge of jetty-7 into jetty-8 2011-07-11 12:05:58 +10:00
src/main/java/org/eclipse/jetty/osgi Merge remote-tracking branch 'origin/master' into jetty-8 2011-07-25 17:42:30 +10:00
build.properties clean 2010-06-10 22:55:47 +00:00
pom.xml Merge of jetty-7 into jetty-8 2011-07-11 12:05:58 +10:00