diff options
| author | Jesse McConnell | 2012-11-05 17:52:18 +0000 |
|---|---|---|
| committer | Jesse McConnell | 2012-11-05 17:52:18 +0000 |
| commit | eac9414f014d37d2c3831677b8e749f5c6ff537b (patch) | |
| tree | 5330b50eefcf49d4968ccf966eaa5b9cd95e3aa3 /jetty-websocket/src | |
| parent | 55de6fc6e425a7bdfdc550f460e821f26b156d54 (diff) | |
| parent | 53f1892f7b9e27fdba1139a7c38e32d601ee5c40 (diff) | |
| download | org.eclipse.jetty.project-eac9414f014d37d2c3831677b8e749f5c6ff537b.tar.gz org.eclipse.jetty.project-eac9414f014d37d2c3831677b8e749f5c6ff537b.tar.xz org.eclipse.jetty.project-eac9414f014d37d2c3831677b8e749f5c6ff537b.zip | |
Merge branch 'jetty-7' into jetty-8
Diffstat (limited to 'jetty-websocket/src')
| -rw-r--r-- | jetty-websocket/src/test/java/org/eclipse/jetty/websocket/dummy/DummyServer.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/dummy/DummyServer.java b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/dummy/DummyServer.java index 9b41e51e2f..1a9ff16fcd 100644 --- a/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/dummy/DummyServer.java +++ b/jetty-websocket/src/test/java/org/eclipse/jetty/websocket/dummy/DummyServer.java @@ -15,6 +15,7 @@ // You may elect to redistribute this code under either of these licenses. // ======================================================================== // + package org.eclipse.jetty.websocket.dummy; import static org.hamcrest.Matchers.*; |