]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd53a40 4c0f7f2)
Merge branch 'master' into divVerent/newboxparticles divVerent/newboxparticles
authorRudolf Polzer <divverent@xonotic.org>
Sat, 27 Jul 2013 10:08:53 +0000 (12:08 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 27 Jul 2013 10:08:53 +0000 (12:08 +0200)

Trivial merge