]> 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: e485fd2 f1378be)
Merge remote-tracking branch 'origin/samual/fixes_for_latest_merge'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 14 Mar 2011 07:11:31 +0000 (08:11 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 14 Mar 2011 07:11:31 +0000 (08:11 +0100)

Trivial merge