]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f393206 7c9b33c)
Merge branch 'master' into akari/irc
authorAkari <hetors.email@gmail.com>
Sun, 1 May 2011 09:17:12 +0000 (12:17 +0300)
committerAkari <hetors.email@gmail.com>
Sun, 1 May 2011 09:17:12 +0000 (12:17 +0300)

Trivial merge