]> 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 | compact (merge: 16793b4 1401bab)
Merge commit 'origin/tzork/pathlib'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 19:24:21 +0000 (21:24 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 19:24:21 +0000 (21:24 +0200)

Trivial merge