]> 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: 5229c80 a06213d)
Merge remote branch 'origin/divVerent/fruitiex-textures' into fruitiex/runningmanctf
authorFruitieX <rasse@rasse-laptop.(none)>
Sat, 2 Oct 2010 14:19:13 +0000 (17:19 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sat, 2 Oct 2010 14:19:13 +0000 (17:19 +0300)

Trivial merge