]> 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: efa0c01 b84e07f)
Merge remote-tracking branch 'origin/cbrutail/textures-facility114inx-additionals'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 18 Oct 2011 13:18:57 +0000 (15:18 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 18 Oct 2011 13:18:57 +0000 (15:18 +0200)

Trivial merge