jetty.project/jetty-websocket/src/test/java/org/eclipse/jetty/websocket
Jan Bartel e95301b906 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/SafariD00.java
2013-02-22 18:37:29 +11:00
..
WebSocketMinVersionTest.java 401317 - Make Safari 5.x websocket support minVersion level error more clear 2013-02-21 17:23:17 -07:00