Hi I'm merging the newest trunk into my treeview branch and came across some not-so-obvious-to-resolve conflicts in the Amiga code. I think it's better if Chris takes a look at it instead of me messing with code which I don't understand :). Necessary files are attached.
Best Regards, Paul B.
unresolved.tar.gz
Description: GNU Zip compressed data
