]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit5c990d08f334f0db9f9f1b38ccb5633e7c4bfa10
treedb8bc7627cbcbed3be224e4865fee574e155f01e
parent8fcb8c412f42cbdee7f85162f45424880a591682
parent278ee02961bab67692e8ef49cec2a502b01f98e4
Merge remote branch 'origin/fruitiex/allow-g_warmup'