]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commit1efb9e6e69cd029d3f8ecfa18d9129638f9a4b84
tree9694bc0ff9fb38b5b440f0a02eb322a26af741d7tree | snapshot
parentd8771d8ddffbc16fdc7a75060ef1699e5a2c99a1commit | diff
parent0f4beeaf8bd40cdf3dfd22bed9d5d0b5bb4735fbcommit | diff
Merge branch 'Mario/combined_updates' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuchus/combined_updates_ircmsg
qcsrc/server/cl_player.qc diff1 | diff2 | blob | history