]> 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: e3746a1 54e0ccd)
Merge commit '54e0ccd220df'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 18:35:56 +0000 (20:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 18:35:56 +0000 (20:35 +0200)

Trivial merge