Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 3 Jul 2015 06:29:25 +0000 (16:29 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 3 Jul 2015 06:29:25 +0000 (16:29 +1000)
commit2f239100c8b77275d69972f91ac4e7ff913f3d7c
treed411fd33e8a00ad5a442b16bd71e40b862bb5598
parenteaefffb161cd24ed84ba5c03c9ebc4a651ebbae9
parentcf4d36d9d295ce940e9e9bdf7a711e4036de0b3c
Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys

# Conflicts:
# qcsrc/client/main.qc
# qcsrc/client/progs.src
# qcsrc/menu/menu.qc
# qcsrc/menu/progs.src
# qcsrc/server/g_world.qc
qcsrc/client/main.qc
qcsrc/client/progs.src
qcsrc/menu/menu.qc
qcsrc/menu/progs.src
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/progs.src
qcsrc/server/t_items.qc