]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8e3716 a2709ce)
Merge remote-tracking branch 'origin/terencehill/align_fix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 13 Sep 2011 14:25:28 +0000 (16:25 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 13 Sep 2011 14:25:28 +0000 (16:25 +0200)

Trivial merge