]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/serverlist
authorSamual Lenks <samual@xonotic.org>
Tue, 8 Oct 2013 16:25:36 +0000 (12:25 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 8 Oct 2013 16:25:36 +0000 (12:25 -0400)
commitfa4ba6cd36e500c0b6744d12bfa1e7bfa7b39ccd
tree5566d786716e6029a84263c32b86188ec5d1c40c
parent9f005be8d5163adf0a2c88c881a0a048b85e18ce
parentec47dd8f690eaadca8936d4092edac9020edf201
Merge remote-tracking branch 'origin/master' into samual/serverlist