]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/serverlist
authorRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 05:21:21 +0000 (07:21 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 05:21:21 +0000 (07:21 +0200)
commit9a199db20227fab8dd8d446f2ef59f74b8178f06
treef669f8d40422464eddc990dc31c85e4127646635
parent8cedf0c162fcfe347d2f7dccaf33053210c870ca
parent7ddcceb3975e8849a66a683bfd28b98d4996e1a2
Merge remote-tracking branch 'origin/master' into samual/serverlist