]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/individual_switchdelay
authorSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 17:59:18 +0000 (13:59 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 14 May 2013 17:59:18 +0000 (13:59 -0400)
commit55c5e5f476604b1e99df20f8974d561f99d0f405
tree982a339f70c965f29d642d7040f2d313c1cd8456
parentbeac65b0b630befc7fafba0126498a22b3defabb
parent001250c1f7d5600a59a92fc781fae4deeda12ce5
Merge remote-tracking branch 'origin/master' into samual/individual_switchdelay
qcsrc/client/Main.qc
qcsrc/server/cl_client.qc