]> 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: 4c81a3f 7ee5593)
Merge remote branch 'refs/remotes/origin/tzork/texture-n-shader-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:33:23 +0000 (20:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:33:23 +0000 (20:33 +0200)

Trivial merge