]> 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 | combined (merge: 226ca8b 3238edf)
Merge branch 'samual/crylink_updates' into samual/change_default_balance
authorSamual <samual@xonotic.org>
Mon, 21 Mar 2011 23:24:49 +0000 (19:24 -0400)
committerSamual <samual@xonotic.org>
Mon, 21 Mar 2011 23:24:49 +0000 (19:24 -0400)

Trivial merge