This has caught be out a few times :( It is a binary file, so if it has been altered in two (or more) branches, git can't merge it, and it can be a pain trying to sort this out.
I've started building an HTML version, following a similar structure to the User Guide. At the same time I'm finding a few errors and missing entries. For now, if you are making pull requests please do alter either the .ods or the new dev_notes/Yoshimi Controls, but send me an email of any changes you want included. However, suggestions welcome! This could take a while :( -- Will J Godfrey {apparently now an 'elderly'} _______________________________________________ Yoshimi-devel mailing list Yoshimi-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/yoshimi-devel