Merge branch 'master' of ssh://goldsmith.journeyman.cc/srv/git/mw-parser

Errmmm... forgot to pull before editing. D'oh!
This commit is contained in:
Simon Brooke 2014-08-13 19:21:40 +01:00
commit 4ce26c031e

View file

@ -98,7 +98,7 @@ A _condition_ is one of:
#### About neighbours #### About neighbours
Note that everywhere above I've used 'neighbours', you can use 'neighbours Note that everywhere above I've used 'neighbours', you can use 'neighbours
within _distance_'. within _distance_', where _distance_ is a (small) positive integer.
A cell has eight immediate neighbours - cells which actually touch it (except A cell has eight immediate neighbours - cells which actually touch it (except
for cells on the edge of the map, which have fewer). If the cell we're for cells on the edge of the map, which have fewer). If the cell we're