]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/menu/anim/keyframe.c
Merge remote branch 'origin/master' into tzork/csqc-items
authorJakob MG <jakob_mg@hotmail.com>
Sun, 20 May 2012 13:29:33 +0000 (15:29 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 20 May 2012 13:29:33 +0000 (15:29 +0200)
commitb41f7ee415c9cc35d6304ca237986a9e445ffd4c
tree23e03b41f296df1aab6a8767bfdbcb4fd5d4b9ae
parent7f6d1aa2bb2a2026299341daff4a634ff4b2b7c0
parent5f5505ba20abda2ac0d8eec592d6082846a49b19
Merge remote branch 'origin/master' into tzork/csqc-items
defaultXonotic.cfg
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/t_items.qc