]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge remote-tracking branch 'origin/diabolik/afterslime'
authormerlijn <mhofstra@gmail.com>
Tue, 14 Jun 2011 06:53:33 +0000 (08:53 +0200)
committermerlijn <mhofstra@gmail.com>
Tue, 14 Jun 2011 06:53:33 +0000 (08:53 +0200)
commit7952e74e951e659a1721bc8e2ddff421947132f8
treeaa110668036b53a077ed29ccba787eeddad7a15a
parent51076100b18653246596133c613a447b56c59fb6
parent10fec8f6a669f5f9a954f41d39fc541c56070df6
Merge remote-tracking branch 'origin/diabolik/afterslime'