]> git.xonotic.org Git - xonotic/darkplaces.git/commit
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)
commit7a78585b9e14936dfa3d3b7b2a906ffac23bb2e5
treea1ca493971509ab98358ad9ebf58ec0b68441868
parentf3932067b589ee5a77516a936a1476a87e661906
parent7c9b33c2b122a788bb81c3e1dd0bb172f9cdc706
Merge branch 'master' into akari/irc