]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/menu/xonotic/tabcontroller.c
Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:36:15 +0000 (10:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:36:15 +0000 (10:36 +0200)
commit16c35f41a25bb2edf3d4b7d664049d2923000f96
tree7fd3d59d6af3290fca7e051eaa01e9a6ac203ffd
parentb0259aa7cd71ac09094e96c4986318ae476f3180
parent091db94fed51362320e122b4e1745626c4f929d7
Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots'