diff options
| author | Jesse McConnell | 2013-01-31 14:01:58 +0000 |
|---|---|---|
| committer | Jesse McConnell | 2013-01-31 14:01:58 +0000 |
| commit | 50f5fe671623c65bddbdfd824d9d19b5392cddb0 (patch) | |
| tree | c6eaff17a84c07d0a77388078ad636c90986926c /jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java | |
| parent | edf898bdd11523f5a68356edcaff93a21b975c4f (diff) | |
| parent | c87cc4d4f09d06d44be1f056412a7baf7b2c758c (diff) | |
| download | org.eclipse.jetty.project-50f5fe671623c65bddbdfd824d9d19b5392cddb0.tar.gz org.eclipse.jetty.project-50f5fe671623c65bddbdfd824d9d19b5392cddb0.tar.xz org.eclipse.jetty.project-50f5fe671623c65bddbdfd824d9d19b5392cddb0.zip | |
Merge branch 'jetty-7' into release-7
Diffstat (limited to 'jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java')
| -rw-r--r-- | jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java index b365ee6dfd..1e27bfae72 100644 --- a/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java +++ b/jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java @@ -1,6 +1,6 @@ // // ======================================================================== -// Copyright (c) 1995-2012 Mort Bay Consulting Pty. Ltd. +// Copyright (c) 1995-2013 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 |