]> 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: f9437c7 b7d48ce)
Merge remote-tracking branch 'origin/terencehill/not_resizable_panel_bugfix'
authorSamual Lenks <samual@xonotic.org>
Wed, 24 Oct 2012 21:39:53 +0000 (17:39 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 24 Oct 2012 21:39:53 +0000 (17:39 -0400)

Trivial merge