]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 953ca9f 6d98d03)
Merge branch 'master' of ssh://gitlab.com/xonotic/darkplaces into Melanosuchus/preconnect
authorMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 4 Mar 2015 13:28:50 +0000 (14:28 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 4 Mar 2015 13:28:50 +0000 (14:28 +0100)
1  2 
sv_user.c patch | diff1 | diff2 | blob | history

diff --cc sv_user.c
Simple merge