]> 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: 2a1b765 9475dac)
Merge branch 'master' into fruitiex/runningmanctf
authorRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 19:50:29 +0000 (21:50 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 19:50:29 +0000 (21:50 +0200)
Conflicts:
scripts/proceduralx.shader


Trivial merge