]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8632222 0e78511)
Merge remote branch 'origin/diabolik/trak-textures'
authortzork <jakob_mg@hotmail.com>
Tue, 25 Jan 2011 21:33:00 +0000 (22:33 +0100)
committertzork <jakob_mg@hotmail.com>
Tue, 25 Jan 2011 21:33:00 +0000 (22:33 +0100)

Trivial merge