]> 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: ec58168 4dc230f)
Merge branch 'master' into divVerent/fruitiex-textures
authorRudolf Polzer <divverent@alientrap.org>
Wed, 29 Sep 2010 08:52:21 +0000 (10:52 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 29 Sep 2010 08:52:21 +0000 (10:52 +0200)

Trivial merge