]> 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 | compact (merge: c540b45 af70ac3)
Merge remote-tracking branch 'origin/Mario/hagar_load_fix'
authorSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 21:52:50 +0000 (17:52 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 21:52:50 +0000 (17:52 -0400)

Trivial merge