Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege_bad_texture_fix' xonotic-v0.7.0
authorSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 20:55:28 +0000 (16:55 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 20:55:28 +0000 (16:55 -0400)
commit526a37a244f31bba7663a7143ff295671acbaf1e
tree0881f87cf4fee8da1af61a0b98f606574ec16458
parent5f5b63ec0f760cac57a2f84709c624396cb94b7f
parent54e5cecd876a9cbb959e019af8a36953f43c021f
Merge remote-tracking branch 'origin/kuniuthefrogg/silentsiege_bad_texture_fix'