]> 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: 09a514b 53ec6ce)
Merge remote branch 'origin/master' into cbrutail/shaders_fx_xonotic2
authorRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:15:59 +0000 (12:15 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 21 Jul 2010 10:15:59 +0000 (12:15 +0200)

Trivial merge