]> 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: 2c5b8e6 5bebcaa)
Merge remote branch 'origin/divVerent/newwaypointsprites'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 07:16:32 +0000 (09:16 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 07:16:32 +0000 (09:16 +0200)

Trivial merge