]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Merge branch 'master' of ssh://gitlab.com/xonotic/darkplaces into Melanosuchus/preconnect
authorMattia Basaglia <mattia.basaglia@gmail.com>
Sat, 31 Jan 2015 21:44:50 +0000 (22:44 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Sat, 31 Jan 2015 21:44:50 +0000 (22:44 +0100)
commitcc9aecda08c0efed08aa9eee011c79c3bca883e9
treeac1254c44d80b8733984f26c6fa50c7e710257c2
parent5f19899fd978adddb7e841e54647de720afff027
parent6b35b45bab4d85378a2c813313811a73bfaeccc4
Merge branch 'master' of ssh://gitlab.com/xonotic/darkplaces into Melanosuchus/preconnect