changes conflict fix
authornveid <nveid@comcast.net>
Mon, 11 Sep 2006 06:07:03 +0000 (06:07 +0000)
committernveid <nveid@comcast.net>
Mon, 11 Sep 2006 06:07:03 +0000 (06:07 +0000)
commit5db74f77f0f0de0d82372fa2d856101a85ef8588
tree97e88804ef03912ab94adbcf1ff1aa96fe1c508d
parenta061df22c86fb5fa123bb730191b7fee856ddb30
changes conflict fix
game/txt/changes.txt