]> 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: f8bfc90 56ed5bb)
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 4 Aug 2013 09:34:23 +0000 (19:34 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 4 Aug 2013 09:34:23 +0000 (19:34 +1000)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/projectile.qc patch | diff1 | diff2 | blob | history
qcsrc/common/mapinfo.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/projectile.qc
Simple merge
diff --cc qcsrc/common/mapinfo.qc
Simple merge