]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56a7f50 1835399)
Merge remote branch 'origin/tzork/shadescript'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 26 Sep 2010 13:45:00 +0000 (15:45 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 26 Sep 2010 13:45:00 +0000 (15:45 +0200)

Trivial merge