]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/atheros/secret'
authorRudolf Polzer <divverent@xonotic.org>
Thu, 27 Oct 2011 07:35:27 +0000 (09:35 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 27 Oct 2011 07:35:27 +0000 (09:35 +0200)
commit30cd3220d0370aa10dfb62eeb2ee3145d56b1c68
treebe732018b6965a9a1cbb5f5b61df25accf014bb2
parent409ea2630e52902d32a6dab3b3558682a2721146
parentc34b1b5138bcf97e9049f85cd816055e822e8113
Merge remote-tracking branch 'origin/atheros/secret'

Conflicts:
qcsrc/server/progs.src
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src