]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43e5979 27343f2)
Merge branch 'master' into martin-t/uncrustify
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 24 Sep 2017 18:15:04 +0000 (20:15 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 24 Sep 2017 18:15:04 +0000 (20:15 +0200)
1  2 
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

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