]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12b6d2c d2daf00)
::stable-branch::reset=d2daf00cd44c7a3be817bfddbf221ff6029f8efb
authorRudolf Polzer <divverent@alientrap.org>
Tue, 3 Jan 2012 23:58:28 +0000 (00:58 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 3 Jan 2012 23:58:28 +0000 (00:58 +0100)

Trivial merge