]> 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>
Mon, 2 Mar 2015 20:43:19 +0000 (21:43 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Mon, 2 Mar 2015 20:43:19 +0000 (21:43 +0100)
commita44e85c2adf1cfead15035e5199310b34e6bdc78
treeab51aed8e95d86e8a19e70ab71502977463975bf
parent875f8d43d749b50d2bf5ebe21e8d6a791a00acb3
parentd5702d667cbc29f4198611f296b583d1f329e01b
Merge branch 'master' of ssh://gitlab.com/xonotic/darkplaces into Melanosuchus/preconnect