]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fcb8c4 278ee02)
Merge remote branch 'origin/fruitiex/allow-g_warmup'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 15 Dec 2010 18:05:05 +0000 (19:05 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 15 Dec 2010 18:05:05 +0000 (19:05 +0100)

Trivial merge