]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5fe5954 a7f3060)
Merge branch 'master' into divVerent/desktopfullscreen
authorRudolf Polzer <divverent@xonotic.org>
Fri, 30 Aug 2013 08:25:05 +0000 (10:25 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 30 Aug 2013 08:25:05 +0000 (10:25 +0200)

Trivial merge