]> 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: 737ae27 951578a)
Merge remote branch 'origin/master' into tzork/csqc-items
authorJakob MG <jakob_mg@hotmail.com>
Tue, 3 Apr 2012 15:49:48 +0000 (17:49 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 3 Apr 2012 15:49:48 +0000 (17:49 +0200)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history
qcsrc/server/t_items.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge
diff --cc qcsrc/server/t_items.qc
Simple merge