]> 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: 60c66fe 1b9fb24)
Merge remote branch 'refs/remotes/origin/diabolik/nexmodel'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 08:10:12 +0000 (10:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 08:10:12 +0000 (10:10 +0200)

Trivial merge