]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b458653 7ef3afe)
Merge remote-tracking branch 'origin/samual/fixes_for_latest_merge'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 30 Mar 2011 20:28:58 +0000 (22:28 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 30 Mar 2011 20:28:58 +0000 (22:28 +0200)

Trivial merge