]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d7fb7a 898b00a)
Merge remote branch 'origin/div0-stable' into samual/movetype_spectator
authorSamual <samual@xonotic.org>
Tue, 31 May 2011 23:51:59 +0000 (19:51 -0400)
committerSamual <samual@xonotic.org>
Tue, 31 May 2011 23:51:59 +0000 (19:51 -0400)

Trivial merge