]> 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: c1afbb3 750de01)
Merge branch 'master' into martin-t/echo
authorMario <mario.mario@y7mail.com>
Fri, 27 Sep 2019 14:43:33 +0000 (00:43 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 27 Sep 2019 14:43:33 +0000 (00:43 +1000)
1  2 
qcsrc/tools/qcc.sh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/tools/qcc.sh
Simple merge