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)
commit491748a8cb340cd7445d06ce60a042fd5de4805b
tree6142da141c7272dd98f67f3784a69dfe34f4d6f5
parent2d0aab259acf56720dacfec2632aaa8f1dbbb4f5
parent0804f3eed80cba40d8a7a413da95a5ee70d490c6
Merge remote-tracking branch 'origin/terencehill/docs_update'

# 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