Merge branch 'master' of github.com:RosePad/Socket.IO-node

* 'master' of github.com:RosePad/Socket.IO-node:
  Client updated
  Client updated
  Scripts order fix in chat
  Client update

Conflicts:
	test/chat.html
	test/client
This commit is contained in:
Guillermo Rauch
2010-03-18 20:08:59 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -3,7 +3,7 @@
<head>
<title>socket.io client test</title>
<script src="/client/socket.io.min.js"></script>
<script src="/client/socket.io.js"></script>
</head>
<body>