]> 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 | combined (merge: 9c5210d aabd098)
Merge remote-tracking branch 'origin/terencehill/tooltips_update'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 27 Aug 2011 14:07:18 +0000 (16:07 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 27 Aug 2011 14:07:18 +0000 (16:07 +0200)

Trivial merge