Merge branch 'paxed-xlogfile'

diff --cc doc/fixes35.0
Simple merge

diff --cc include/extern.h
Simple merge

diff --cc src/do.c
Simple merge

diff --cc src/dungeon.c
Simple merge

diff --cc src/mon.c
Simple merge

diff --cc src/restore.c
Simple merge

diff --cc src/save.c
Simple merge

diff --cc src/sp_lev.c
Simple merge