Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2012-08-17 16:48:22 -0400
committerJoakim Erdfelt2012-08-17 16:48:22 -0400
commit6311976e8614190fb418b9f74321719c7c1184b8 (patch)
treed7b29bf1fc6d6212abff85df999d9f8779cf8b90 /jetty-websocket
parentb36b41afd7576394110005cc7583507b3c911b96 (diff)
parent3d1d76d214c9324d748aa86cf64fb7de053b56f3 (diff)
downloadorg.eclipse.jetty.project-6311976e8614190fb418b9f74321719c7c1184b8.tar.gz
org.eclipse.jetty.project-6311976e8614190fb418b9f74321719c7c1184b8.tar.xz
org.eclipse.jetty.project-6311976e8614190fb418b9f74321719c7c1184b8.zip
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
Diffstat (limited to 'jetty-websocket')
-rw-r--r--jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java27
1 files changed, 15 insertions, 12 deletions
diff --git a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java
index f3536298ab..1934080201 100644
--- a/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java
+++ b/jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java
@@ -1,18 +1,21 @@
-// ========================================================================
-// Copyright 2011-2012 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
//
-// The Eclipse Public License is available at
-// http://www.eclipse.org/legal/epl-v10.html
+// ========================================================================
+// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
//
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
//
-// You may elect to redistribute this code under either of these licenses.
-//========================================================================
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+//
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+//
+
package org.eclipse.jetty.websocket.server.helper;
import static org.hamcrest.Matchers.is;

Back to the top