]> 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: b4f6693 4418200)
Merge branch 'master' into martin-t/dmgtext2
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 11 May 2017 18:30:11 +0000 (20:30 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 11 May 2017 18:30:11 +0000 (20:30 +0200)
1  2 
qcsrc/client/miscfunctions.qc patch | diff1 | diff2 | blob | history

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