]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/verbose_warnings
authorSamual <samual@xonotic.org>
Tue, 3 May 2011 20:56:41 +0000 (16:56 -0400)
committerSamual <samual@xonotic.org>
Tue, 3 May 2011 20:56:41 +0000 (16:56 -0400)
commit54597f9a6f2afe6fc2834a113da16262f8bad285
treec8c3f16c487c157a9aaec93444579e0552f3f8ef
parent9f1d077757a4ebb6bffc43da0b626cca04ea12e3
parent7926d6c59c1401f4c7aec78c428f9b3766e133a7
Merge remote branch 'origin/master' into samual/verbose_warnings