]> 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: c4d74d8 c8590ef)
Merge branch 'master' into martin-t/okc
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 15:04:58 +0000 (17:04 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 15:04:58 +0000 (17:04 +0200)
1  2 
qcsrc/common/mutators/mutator/nades/nades.qc patch | diff1 | diff2 | blob | history
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history
qcsrc/common/t_items.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/t_items.qc
Simple merge
diff --cc qcsrc/common/t_items.qh
Simple merge