]> git.rm.cloudns.org Git - xonotic/netradiant.git/commit
Merge branch 'master' into divVerent/colormod
authorRudolf Polzer <divverent@alientrap.org>
Mon, 14 May 2012 18:56:23 +0000 (20:56 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 14 May 2012 18:56:23 +0000 (20:56 +0200)
commit9557abbf571aaf6bd9180e05baa209f25ebade3a
treedf4d1d97ccfaf447dc575d7b64fc8ad356b0386b
parent0b86577ab8b9bcd3403b77eafc33c2048b147d35
parent0bbb58dd9cc75dc34d2bdba9f12679f6fd9f9ce5
Merge branch 'master' into divVerent/colormod

Conflicts:
tools/quake3/q3map2/model.c
tools/quake3/q3map2/map.c
tools/quake3/q3map2/model.c
tools/quake3/q3map2/q3map2.h
tools/quake3/q3map2/surface.c
tools/quake3/q3map2/surface_foliage.c