]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8771d8 0f4beea)
Merge branch 'Mario/combined_updates' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir... Melanosuchus/combined_updates_ircmsg
authorMattia Basaglia <mattia.basaglia@gmail.com>
Sun, 26 Apr 2015 19:18:44 +0000 (21:18 +0200)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Sun, 26 Apr 2015 19:18:44 +0000 (21:18 +0200)
1  2 
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/cl_player.qc
Simple merge