]> 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: 6ed48ad f433390)
Merge remote-tracking branch 'origin/cbrutail/newtexture-facility114inxtrim_green'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 3 Oct 2011 14:17:24 +0000 (16:17 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 3 Oct 2011 14:17:24 +0000 (16:17 +0200)

Trivial merge