]> icculus.org git repositories - divverent/nexuiz.git/commit
Merge second change into the branch.
authorblack <black@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 15 Apr 2006 12:29:07 +0000 (12:29 +0000)
committerblack <black@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Sat, 15 Apr 2006 12:29:07 +0000 (12:29 +0000)
commit13f2c744e830ec40df77713d645396ed9621b327
treef1cca9433bb002111dc82baf29dc4f8f54528497
parent70553986369f4484a6b6488010d886709bb6c22e
Merge second change into the branch.

git-svn-id: svn://svn.icculus.org/nexuiz/branches/smenu@1287 f962a42d-fe04-0410-a3ab-8c8b0445ebaa