Merge branch 'master' of tuxcode.org:pentagameshow

This commit is contained in:
Frank Becker 2011-12-27 23:52:08 +01:00
commit 018e92a61e
3 changed files with 6 additions and 4 deletions

View File

@ -63,12 +63,12 @@
<p>Welches Land erlaubt Filesharing für private Zwecke straffrei?</p> <p>Welches Land erlaubt Filesharing für private Zwecke straffrei?</p>
</div> </div>
<div id="nedap"> <div id="nedap">
<p class="url">http://spaceboyz.net:2342/</p> <p class="url">http://nedap.c3d2.de:2342/</p>
<canvas id="polls" width="400" height="400"> <canvas id="polls" width="400" height="400">
</canvas> </canvas>
</div> </div>
<div id="gifs"> <div id="gifs">
<p class="url">http://spaceboyz.net:2342/</p> <p class="url">http://nedap.c3d2.de:2342/</p>
</div> </div>
<div id="irc"> <div id="irc">
<p class="caption">Backend, where are thou?</p> <p class="caption">Backend, where are thou?</p>

View File

@ -6,6 +6,8 @@
"ltx":">=0.1.1", "ltx":">=0.1.1",
"websocket":">=1.0.1", "websocket":">=1.0.1",
"mime": ">=1.2.4", "mime": ">=1.2.4",
"twitter": ">=0.1.17" "twitter": ">=0.1.17",
"formidable": ">=1.0.8",
"qs": ">=0.4.0"
} }
} }

View File

@ -43,7 +43,7 @@ function connectNedap() {
console.error(e.stack || e); console.error(e.stack || e);
setTimeout(connectNedap, 1000); setTimeout(connectNedap, 1000);
}); });
nedapClient.connect('ws://spaceboyz.net:2342/', 'quiz-nedap'); nedapClient.connect('ws://nedap.c3d2.de:2342/', 'quiz-nedap');
} }
connectNedap(); connectNedap();