]> 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: f85ba46 e48453e)
Merge remote-tracking branch 'origin/samual/update_effects_tab'
authorSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:53:03 +0000 (11:53 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:53:03 +0000 (11:53 -0400)

Trivial merge