]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/xpm'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:07:31 +0000 (14:07 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:07:31 +0000 (14:07 +0100)
commit600222ffd7b37780d4c94a448150977c9750ef5c
treeccc13ffd8d6f6e37859bbcdb23733f3177e6043e
parentb103565e6f9acdea2b09fcaf1469df72cffee0db
parent1e126f0771ce2f9f3dae894f747eee37e18e2a41
Merge remote branch 'origin/fruitiex/xpm'
qcsrc/server/g_world.qc