diff options
| author | Joakim Erdfelt | 2012-08-17 16:44:22 -0400 |
|---|---|---|
| committer | Joakim Erdfelt | 2012-08-17 16:44:22 -0400 |
| commit | 3d1d76d214c9324d748aa86cf64fb7de053b56f3 (patch) | |
| tree | dd685408b52ac7f0168c3a42492d5f4bd730f367 /jetty-websocket | |
| parent | ce6820b67bf53904ed26d8db1bea566fbcb40593 (diff) | |
| parent | 8e9bcf48f2b81a13734e96fad7c7cf5571289f00 (diff) | |
| download | org.eclipse.jetty.project-3d1d76d214c9324d748aa86cf64fb7de053b56f3.tar.gz org.eclipse.jetty.project-3d1d76d214c9324d748aa86cf64fb7de053b56f3.tar.xz org.eclipse.jetty.project-3d1d76d214c9324d748aa86cf64fb7de053b56f3.zip | |
Merge from jetty-8 to jetty-9 (license header standarization)
Diffstat (limited to 'jetty-websocket')
| -rw-r--r-- | jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/helper/SafariD00.java | 27 |
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; |