]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d0aab2 0804f3e)
Merge remote-tracking branch 'origin/terencehill/docs_update'
authorSamual Lenks <samual@xonotic.org>
Sun, 29 Dec 2013 10:23:48 +0000 (05:23 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 29 Dec 2013 10:23:48 +0000 (05:23 -0500)
# By terencehill
# Via terencehill
* origin/terencehill/docs_update:
  Remove runes/curses bit mask specifications from eventlog.txt
  Update and simplify beginning of section I of mapping.txt
  Remove references to Runematch in mapping.txt
  Document that currently CA can have a more than 2 teams


Trivial merge