]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into tzork/turrets-csqc
authorJakob MG <jakob_mg@hotmail.com>
Sat, 9 Apr 2011 05:32:49 +0000 (07:32 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sat, 9 Apr 2011 05:32:49 +0000 (07:32 +0200)
commit6b1a4fca29a32b7230ce0b89ddf55dd93ef7e31c
treed1883bb5e8953531a641e0a709777e9c223cd650
parentd204c4e1fe5f39ee19d8b825656b63f4f350dc9c
parent8d640f864cdbdefc91f91897447abfd2639f9efe
Merge remote-tracking branch 'origin/master' into tzork/turrets-csqc