]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Fri, 18 Oct 2013 22:40:46 +0000 (09:40 +1100)
committerMario <mario.mario@y7mail.com>
Fri, 18 Oct 2013 22:40:46 +0000 (09:40 +1100)
12 files changed:
1  2 
commands.cfg
defaultXonotic.cfg
qcsrc/client/progs.src
qcsrc/common/notifications.qh
qcsrc/common/util.qh
qcsrc/menu/progs.src
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src

diff --cc commands.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 97e17ff3c0860e6bdb0eb83c4982b6e6f1c0eb38,4900b9d96bb52db193c8aaf82771634c94279755..86cb9621c7e31d2082e45dc01bf579cfd226d757
@@@ -53,8 -52,5 +53,6 @@@ xonotic/util.q
  ../common/mapinfo.qc
  ../common/items.qc
  ../common/urllib.qc
 +../common/monsters/monsters.qc
  
  ../warpzonelib/mathlib.qc
- ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge