]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Merge branch 'master' into akari/irc
authorAkari <hetors.email@gmail.com>
Fri, 15 Apr 2011 08:12:28 +0000 (11:12 +0300)
committerAkari <hetors.email@gmail.com>
Fri, 15 Apr 2011 08:12:28 +0000 (11:12 +0300)
commit649b809fcb96cf743aa6b455782b3567276e01f4
tree7d9496505b9757409c30b333bb976ab3f827359c
parent854fba21d443e6a69a08199dc0e83661d914367a
parent1b94bbb1a2eb689286a262ffa1baee2ae635250a
Merge branch 'master' into akari/irc
makefile.inc