]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f19899 6b35b45)
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)

Trivial merge