]> 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: ae1cfaa 0370dd4)
Merge remote branch 'origin/terencehill/waypointsprite_alpha_fix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 14 Dec 2010 06:56:53 +0000 (07:56 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 14 Dec 2010 06:56:53 +0000 (07:56 +0100)

Trivial merge