]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/guide
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 21 Aug 2015 08:57:07 +0000 (18:57 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 21 Aug 2015 09:02:58 +0000 (19:02 +1000)
commitb9359ac5b94cded57c14dd79bebe26ef13322a96
tree27873278696d8461210a3b6c9d2e8e2d65f42071
parent33daf314a7810ccad0c03f70ee485b29b296a6ba
parent242f8fcc511304cd950ad07481f0606fbe6257a9
Merge branch 'master' into TimePath/guide

# Conflicts:
# qcsrc/Makefile
# qcsrc/common/items/item/ammo.qc
# qcsrc/common/items/item/jetpack.qc
# qcsrc/common/items/item/powerup.qc
qcsrc/common/items/item/armor.qc
qcsrc/common/items/item/jetpack.qc
qcsrc/common/items/item/powerup.qc
qcsrc/common/weapons/all.qc