]> 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: ce3d97c f9c90da)
Merge commit 'origin/parasti/uncrlf' into divVerent/bastet
authorRudolf Polzer <divverent@alientrap.org>
Fri, 16 Apr 2010 17:00:22 +0000 (19:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 16 Apr 2010 17:00:22 +0000 (19:00 +0200)

Trivial merge