]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Merge remote branch 'origin/div0-stable' into samual/movetype_spectator
authorSamual <samual@xonotic.org>
Sun, 14 Aug 2011 22:29:25 +0000 (18:29 -0400)
committerSamual <samual@xonotic.org>
Sun, 14 Aug 2011 22:29:25 +0000 (18:29 -0400)
commitff96950bde1c8966f55d0f7b81ff4546a7c81edf
tree64416f8847082eec9a18acb6d0dc23a6cc9b347a
parent1c01abad5d8208e8d2a06cd06b5a18db65d3fdee
parent5341d9394eaad8c3752d9a318f9308d47c428b54
Merge remote branch 'origin/div0-stable' into samual/movetype_spectator

Conflicts:
sv_phys.c
server.h
sv_phys.c