]> 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: 18416a9 1bee8c5)
Merge branch 'samual/runningman_separate' of git://de.git.xonotic.org/xonotic/xonotic...
authorFruitieX <fruitiex@gmail.com>
Fri, 15 Feb 2013 21:35:50 +0000 (23:35 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 15 Feb 2013 21:35:50 +0000 (23:35 +0200)

Trivial merge