]> 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: ead998e 5b902bf)
Merge remote branch 'origin/samual/waypointsprite_edgeoffset'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 12 Jul 2011 15:24:41 +0000 (17:24 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 12 Jul 2011 15:24:41 +0000 (17:24 +0200)

Trivial merge