bad merge.

Conflicts: src/ggs_server.erl
2011-02-14 15:20:24 +01:00 · 2011-02-14 15:20:24 +01:00 · 25ad4fb37b
commit 25ad4fb37b
parent cb53cd6908 e945bb0d31
19 changed files with 300 additions and 123 deletions
--- a/games/tic-tac-toe-js/index.html
+++ b/games/tic-tac-toe-js/index.html
@ -12,8 +12,16 @@
 	
 	function init() {
 		GameServer.addGame(game_name, main());
-		GameServer.addClient(game_name, new TicTacToeClient(frames.player1.document.getElementById("p1"), GameServer));
-		GameServer.addClient(game_name, new TicTacToeClient(frames.player2.document.getElementById("p2"), GameServer));
+		GameServer.addClient(
+			game_name,
+			new TicTacToeClient(frames.player1.document.getElementById("p1"),
+			GameServer
+		));
+		GameServer.addClient(
+			game_name,
+			new TicTacToeClient(frames.player2.document.getElementById("p2"),
+			GameServer
+		));
 	}		
 	</script>
 	<link rel="stylesheet" href="css/screen.css" type="text/css" media="screen">
--- a/games/tic-tac-toe-js/proxy.rb
+++ b/games/tic-tac-toe-js/proxy.rb