search

jonniesweb / Magic-Realm

The Magic Realm board game as a simplified multiplayer game
http://en.wikipedia.org/wiki/Magic_Realm
1 stars 1 forks source link

Monster #61

Closed ghost closed 9 years ago

ghost commented 9 years ago

Pull it!

jonniesweb commented 9 years ago

gotta pull in master to fix those conflicts

jonniesweb commented 9 years ago

fixed and merged manually. going to delete this branch then create a new one off of master. @iain-wong you'll have to pull the latest version of the monster branch after I do this to continue developing.

jonniesweb commented 9 years ago

done