fix a couple merging bugs
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 6 Nov 2009 15:05:39 +0000 (15:05 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Fri, 6 Nov 2009 15:05:39 +0000 (15:05 +0000)
commit61237f3f9f4259c7a2135bced343d1b7a9945488
treec12d97bd32b2ca30a4e6a06a52e1c00142c5baca
parent2f225f22e1cfd2d5e2c340d9b16c798af40da30c
fix a couple merging bugs

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9441 d7cf8633-e32d-0410-b094-e92efae38249
cl_particles.c
r_lightning.c