]> 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: 12bea3f ccd4972)
Merge remote branch 'refs/remotes/origin/morphed/uzi_texture'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 15 Jun 2010 09:05:17 +0000 (11:05 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 15 Jun 2010 09:05:17 +0000 (11:05 +0200)

Trivial merge