]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ea555a edecd2d)
Merge branch 'master' into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 13:03:50 +0000 (15:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 13:03:50 +0000 (15:03 +0200)

Trivial merge