projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f16090 5307fd7)
Merge remote branch 'refs/remotes/origin/parasti/import-pk3'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 03:57:06 +0000 (05:57 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 19 Aug 2010 03:57:06 +0000 (05:57 +0200)

Trivial merge