Merge branch 'master' of github.com:tonioni/WinUAE

diff --cc custom.cpp
Simple merge

diff --cc debug.cpp
Simple merge

diff --cc drawing.cpp
Simple merge

diff --cc expansion.cpp
Simple merge

diff --cc specialmonitors.cpp
Simple merge