]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e733629 06e741c)
Merge branch 'master' into divVerent/libavcodec
authorRudolf Polzer <divverent@xonotic.org>
Sun, 5 Jun 2011 18:59:20 +0000 (20:59 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 5 Jun 2011 18:59:20 +0000 (20:59 +0200)

Trivial merge