check in LordHavoc's changes for him after cleaning up the mess of conflicts
authortaniwha <taniwha@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 30 May 2001 04:50:19 +0000 (04:50 +0000)
committertaniwha <taniwha@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 30 May 2001 04:50:19 +0000 (04:50 +0000)
commit91183a9cf607baeda22603b56d904b252006b8b4
tree034c6b09b52e89e85556f46a4111d06a4eba267d
parent7b2a4e51a8411aff49327f121f24986141a6c705
check in LordHavoc's changes for him after cleaning up the mess of conflicts
I caused. I hope I got it right :)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@215 d7cf8633-e32d-0410-b094-e92efae38249
common.c
image.c