]> 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: 6de90e8 ff9d873)
Merge remote branch 'refs/remotes/origin/diabolik/facility114invx'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:38:43 +0000 (05:38 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:38:43 +0000 (05:38 +0200)

Trivial merge