]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 529ba3e d8f8782)
Merge commit 'origin/lda17h/dodging_fixes'
authorRudolf Polzer <rpolzer@grawp.(none)>
Mon, 5 Apr 2010 11:46:29 +0000 (13:46 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Mon, 5 Apr 2010 11:46:29 +0000 (13:46 +0200)

Trivial merge