]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc9aecd f348d97)
Merge branch 'master' of ssh://gitlab.com/xonotic/darkplaces into Melanosuchus/preconnect
authorMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 18 Feb 2015 14:48:39 +0000 (15:48 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 18 Feb 2015 14:48:39 +0000 (15:48 +0100)
1  2 
prvm_offsets.h patch | diff1 | diff2 | blob | history
sv_main.c patch | diff1 | diff2 | blob | history

diff --cc prvm_offsets.h
Simple merge
diff --cc sv_main.c
Simple merge