Merge
authorNicholas Hastings <skamonkey@gmail.com>
Mon Apr 19 11:18:46 2010 -0400 (2010-04-19)
changeset 29502c1f6cedd7a6
parent 2949 6e68df1f339d
parent 2946 b3f3763fd799
child 2951 52bca591313d
Merge
     1.1 --- a/gamedata/core.games/common.games.txt	Mon Apr 19 11:10:26 2010 -0400
     1.2 +++ b/gamedata/core.games/common.games.txt	Mon Apr 19 11:18:46 2010 -0400
     1.3 @@ -163,6 +163,7 @@
     1.4  			"game"					"FortressForever"
     1.5  			"game"					"zps"
     1.6  			"game"					"gesource"
     1.7 +			"game"					"obsidian"
     1.8  		}
     1.9  		
    1.10  		"Keys"