]> 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 | combined (merge: 6dc4550 d9ab860)
Merge branch 'fruitiex/textures' into fruitiex/runningmanctf
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 19:53:35 +0000 (22:53 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 19:53:35 +0000 (22:53 +0300)

Trivial merge