From: Samual Lenks <samual@xonotic.org>
Date: Sun, 29 Dec 2013 10:23:48 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/terencehill/docs_update'
X-Git-Tag: xonotic-v0.8.0~54
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=491748a8cb340cd7445d06ce60a042fd5de4805b

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
---

491748a8cb340cd7445d06ce60a042fd5de4805b