]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7aca330 000100e)
Merge branch 'master' into akari/freezetag-fixes
authorAkari <hetors.email@gmail.com>
Mon, 10 Jan 2011 09:58:38 +0000 (11:58 +0200)
committerAkari <hetors.email@gmail.com>
Mon, 10 Jan 2011 09:58:38 +0000 (11:58 +0200)

Trivial merge