]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 649b809 dd03295)
Merge branch 'master' into akari/irc
authorAkari <hetors.email@gmail.com>
Tue, 26 Apr 2011 07:59:31 +0000 (10:59 +0300)
committerAkari <hetors.email@gmail.com>
Tue, 26 Apr 2011 07:59:31 +0000 (10:59 +0300)

Trivial merge