]> 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: 4bc26d6 b6965c8)
Merge remote branch 'origin/master' into fruitiex/jumppadmodel1
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 12:55:24 +0000 (15:55 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 30 Jul 2010 12:55:24 +0000 (15:55 +0300)

Trivial merge