]> 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: 35e620e f5689f5)
Merge branch 'divVerent/lavafix'
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:57:12 +0000 (20:57 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 00:57:12 +0000 (20:57 -0400)

Trivial merge