projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d38a75 57875ce)
Merge branch 'master' into divVerent/sse-animation-optimizations divVerent/sse-animation-optimizations
authorRudolf Polzer <divverent@xonotic.org>
Mon, 30 Sep 2013 19:54:10 +0000 (21:54 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 30 Sep 2013 19:54:10 +0000 (21:54 +0200)

Trivial merge