]> 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 | combined (merge: fe28e26 840caa9)
Merge remote branch 'refs/remotes/origin/fruitiex/dtghook'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 12:02:21 +0000 (14:02 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Aug 2010 12:02:21 +0000 (14:02 +0200)

Trivial merge