]> 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: e7cd58c 184b359)
Merge remote-tracking branch 'origin/master' into fruitiex/runningmanfix
authorFruitieX <fruitiex@gmail.com>
Tue, 5 Mar 2013 13:15:55 +0000 (15:15 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 5 Mar 2013 13:15:55 +0000 (15:15 +0200)

Trivial merge