]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into divVerent/euclidean_fail
authorRudolf Polzer <divverent@alientrap.org>
Mon, 16 Jan 2012 09:30:45 +0000 (10:30 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 16 Jan 2012 09:30:45 +0000 (10:30 +0100)
commitc0c4fa9e3edcafc93084d7254d5784adcbd6bbc9
treecebe02c8b0b1ece81cc0ac589f40b0e66078cd3b
parent1daf39b7643d8793a51043f3092e4c0f79e175d2
parentd0059d903039167120a2b49e29e77a20079afebf
Merge branch 'master' into divVerent/euclidean_fail

Conflicts:
scripts/shaderlist.txt