]> git.xonotic.org Git - xonotic/darkplaces.git/commit
Merge remote branch 'origin/master' into akari/irc akari/irc
authorSamual <samual@xonotic.org>
Sat, 20 Aug 2011 10:20:39 +0000 (06:20 -0400)
committerSamual <samual@xonotic.org>
Sat, 20 Aug 2011 10:20:39 +0000 (06:20 -0400)
commit6d89dcbc6b8565b1ee3cb7ec63213efde6c7d988
treea9b9d55a0960b08ccdbdde83e7e19aaea9f5323f
parent7a78585b9e14936dfa3d3b7b2a906ffac23bb2e5
parentd1e0fe0cc93cac5ef1849ade897e3a3707a19040
Merge remote branch 'origin/master' into akari/irc

Conflicts:
makefile.inc
cl_main.c
cl_video.c
console.c
keys.c
makefile.inc