]> 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: 78fd790 9c13562)
Merge branch 'master' into mario/domination_mutator
authorMario <mario.mario@y7mail.com>
Thu, 31 Jan 2013 10:40:55 +0000 (21:40 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 31 Jan 2013 10:40:55 +0000 (21:40 +1100)
1  2 
qcsrc/server/mutators/mutators.qh patch | diff1 | diff2 | blob | history
qcsrc/server/progs.src patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/mutators/mutators.qh
Simple merge
diff --cc qcsrc/server/progs.src
Simple merge