Merge branch 'master' into jonte_rewrite

Conflicts:
	src/ggs_coordinator.erl
	src/ggs_gamevm_e.erl
	src/ggs_table.erl
This commit is contained in:
Jonatan Pålsson 2011-02-24 11:38:36 +01:00
commit 97c7e39b4a
23 changed files with 306 additions and 272 deletions

1
.gitignore vendored
View file

@ -2,3 +2,4 @@
*.dump
*.beam
Mnesia.*
*.swo