]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f5b63e 54e5cec)
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)

Trivial merge