]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3bd825e ec35a80)
Merge branch 'Mario/vehicles' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir...
authorMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:12:25 +0000 (13:12 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 2 Dec 2014 02:12:25 +0000 (13:12 +1100)
Conflicts:
qcsrc/server/cl_weapons.qc
qcsrc/server/progs.src

1  2 
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/View.qc
Simple merge