]> 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: 4b635fb 085e323)
Merge remote branch 'origin/morphed/fruitiex-textures' into divVerent/fruitiex-textures
authorRudolf Polzer <divverent@alientrap.org>
Wed, 29 Sep 2010 16:47:25 +0000 (18:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 29 Sep 2010 16:47:25 +0000 (18:47 +0200)

Trivial merge