]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c4fcd15 f6d8bf0)
::stable-branch::reset=f6d8bf009aadd637cd9d7444a564ad1b662d2cf3
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 8 Apr 2017 21:22:55 +0000 (23:22 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 8 Apr 2017 21:22:55 +0000 (23:22 +0200)

Trivial merge