]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branches 'TimePath/oo', 'TimePath/buffsys', 'TimePath/gametypesys'
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 14 Aug 2015 03:53:32 +0000 (13:53 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 14 Aug 2015 03:54:12 +0000 (13:54 +1000)
commitf878adf879c95c0c04ae8806e45aaa285917b39d
tree96a8cb781974cb9a2fc80b75e7935be89bcb75f5
parent5670fc6a49f5fbe6f4d770ed63b2851884b68aa0
parent9793c3823e39dcf3ecc73a36a128280e186644d8
parent6ba6b6eb811c3fe293cfdd883e00344caf68f7a9
Merge branches 'TimePath/oo', 'TimePath/buffsys', 'TimePath/gametypesys'
qcsrc/client/main.qc
qcsrc/common/buffs.qh
qcsrc/common/items/all.qh
qcsrc/common/mapinfo.qc
qcsrc/common/registry.qh
qcsrc/common/util-pre.qh
qcsrc/server/g_world.qc