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)
commit4eb8ac8989271d4b19f6ed823133c69933c7e21a
treeeb46dc29512b90ccc472595e7dd718c87e0056f3
parentead998eb93f3b5df0d46e09455e7aa8fef44540d
parent5b902bfabe6575373dac2ffe636074c0308c6abf
Merge remote branch 'origin/samual/waypointsprite_edgeoffset'