]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44e2ba6 7ec20ec)
Merge remote-tracking branch 'origin/savagex/darkzone-fixomatic'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 12 Mar 2012 09:10:18 +0000 (10:10 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 12 Mar 2012 09:10:18 +0000 (10:10 +0100)

Trivial merge