]> 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: 6f0dc25 da78f42)
Merge remote branch 'origin/savagex/g-23-relight'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 17:58:04 +0000 (19:58 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 17:58:04 +0000 (19:58 +0200)

Trivial merge