]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61cf929 704d101)
::stable-branch::reset=704d101890948f0f496ce4fe73be523137c62117
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 6 Mar 2015 20:36:12 +0000 (21:36 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 6 Mar 2015 20:36:12 +0000 (21:36 +0100)

Trivial merge