From aa11805a3fafcf4fa0381e0079613fc76fe9080d Mon Sep 17 00:00:00 2001
From: Vincent Woo <me@vincentwoo.com>
Date: Mon, 9 Apr 2012 17:11:41 -0700
Subject: [PATCH] dont bother with socketio on submodule, just use npm for
 server portion

---
 .gitmodules    | 3 ---
 deps/socket.io | 1 -
 server.js      | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 160000 deps/socket.io

diff --git a/.gitmodules b/.gitmodules
index f85930f..564ac9c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "deps/headjs"]
 	path = deps/headjs
 	url = https://github.com/headjs/headjs.git
-[submodule "deps/socket.io"]
-	path = deps/socket.io
-	url = https://github.com/LearnBoost/socket.io.git
 [submodule "deps/socket.io-client"]
 	path = deps/socket.io-client
 	url = https://github.com/LearnBoost/socket.io-client.git
diff --git a/deps/socket.io b/deps/socket.io
deleted file mode 160000
index a4e53a6..0000000
--- a/deps/socket.io
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a4e53a642bbb539b44e823abb82d4086f05afc2d
diff --git a/server.js b/server.js
index ed897d2..9892783 100644
--- a/server.js
+++ b/server.js
@@ -123,7 +123,7 @@ function buildStaticFiles() {
   ams.build
     .create(publicDir)
     .add(depsDir + '/JSON-js/json2.js')
-    .add(depsDir + '/Socket.IO/socket.io.js')
+    .add(depsDir + '/socket.io-client/dist/socket.io.js')
     .add(clientDir + '/util.js')
     .add(depsDir + '/jquery-bbq/jquery.ba-bbq.js')
     .add(depsDir + '/jquery.transform.js/jquery.transform.light.js')