]> 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 | compact (merge: a1daec8 5baa648)
Merge branch 'savagex/g-23-relight' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 17:30:29 +0000 (19:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 3 Oct 2010 17:30:29 +0000 (19:30 +0200)

Trivial merge