]> 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: ba95a8c ae27792)
Merge branch 'martin-t/defaults' into martin-t/okc
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Aug 2017 14:18:51 +0000 (16:18 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Aug 2017 14:18:51 +0000 (16:18 +0200)
1  2 
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