]> 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: 2547fdb 30b1053)
Merge remote-tracking branch 'origin/master' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Sat, 14 May 2011 13:04:17 +0000 (16:04 +0300)
committerFruitieX <fruitiex@gmail.com>
Sat, 14 May 2011 13:04:17 +0000 (16:04 +0300)

Trivial merge