]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1daf39b d0059d9)
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)
Conflicts:
scripts/shaderlist.txt


Trivial merge