]> 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: 2993044 ab627cf)
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-data.pk3dir into Melanosuch...
authorMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 18 Feb 2015 15:13:25 +0000 (16:13 +0100)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Wed, 18 Feb 2015 15:13:25 +0000 (16:13 +0100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/dpdefs/csprogsdefs.qh patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/dpdefs/csprogsdefs.qh
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge