]> git.xonotic.org Git - xonotic/darkplaces.git/commit
Merge branch 'div0-stable' into Mario/advanced_chat Mario/advanced_chat
authorMario <mario@smbclan.net>
Sun, 12 Mar 2017 00:21:24 +0000 (10:21 +1000)
committerMario <mario@smbclan.net>
Sun, 12 Mar 2017 00:21:24 +0000 (10:21 +1000)
commitd0b450f13eb5b9ab2694049f0df390183b1b8f27
tree04c2adf49ab73c5994b232dd42b29cfd92782ac9
parent425035b99e005056d62f5e26378646cd285d6295
parent2a210dc2cd025d1658b7d35907bb4af413ee411e
Merge branch 'div0-stable' into Mario/advanced_chat

# Conflicts:
# console.c
# keys.c
console.c
keys.c