]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/cmd_fixes
authorterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:41:24 +0000 (23:41 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 27 Apr 2012 21:41:24 +0000 (23:41 +0200)
commit3618a0f2000f064d6f59b99c7b79d7a3c25f77b9
tree66d1fd7976f5ab4c1f54c1d4fa56949d5ea9bbef
parenta70983634480bcf28eb61077253af85cb5fa6165
parenta4ccbd75da12da9090f3d25ad4dc9edd0efe3060
Merge branch 'master' into terencehill/cmd_fixes

Conflicts:
qcsrc/common/util.qc
qcsrc/client/scoreboard.qc
qcsrc/common/command/generic.qc
qcsrc/common/util.qc
qcsrc/server/command/sv_cmd.qc
qcsrc/server/g_world.qc