Gary - please could you modify the way you work with your diff.txt patches, in order to make merging your changes not be a rapidly steepening uphill struggle.
Please don't include seperately submitted patches (i.e. the next_dialog removal stuff) in diff.txt. Please don't add further modifications (i.e. the development of a resizeable setup) to diff.txt. Do this in a seperate working copy, or, just work with me to get what you have already written, merged, first. Please remove all additions and removals of blank lines from your patch. Thankyou, Max.
