Merge remote branch 'icculus/master'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 25 Jul 2010 15:13:35 +0000 (17:13 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 25 Jul 2010 15:13:35 +0000 (17:13 +0200)
1  2 
tools/quake3/q3map2/light.c

Simple merge