]> 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: 3319f75 4122acc)
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 25 Jun 2013 06:10:26 +0000 (16:10 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 25 Jun 2013 06:10:26 +0000 (16:10 +1000)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
gamemodes.cfg patch | diff1 | diff2 | blob | history
qcsrc/qccversion patch | | | blob
qcsrc/server/t_items.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc gamemodes.cfg
Simple merge
diff --cc qcsrc/qccversion
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..27afd21277404babffd506b96eb089601cfe6feb
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/qcsrc/qccversion
@@@ -1,0 -1,0 +1,1 @@@
++This file intentionally left blank.
diff --cc qcsrc/server/t_items.qc
Simple merge