CodeSnip Old Code (SVN)

Merged trunk changes for release 3.8.9 (i.e. r1303 to r1305, r1307 to r1316) into the v4-dev branch.

Resolved conflicts:
* missing Doc/Design/ConfigFileStructure.odt and Doc/Design/IniDataFileForma.odt in v4-dev is correct - documents have been replaced by HTML docs in Docs/FileFormats directory.
* Docs/ReadMe.txt: used v4-dev changes where conflicted but kept typo fix from trunk.
* VCodeSnip.vi: kept version information from v4-dev but accepted updated copyright date in license block from trunk.

Some files are physically unchanged and have changes only to their svn:mergeinfo property.

Merged trunk changes for release 3.8.8 (i.e. r1284 to r1299) into the v4-dev branch.

Resolved conflicts:
* missing Doc/Design/ConfigFileStructure.odt by in v4-dev is correct - the file has been deleted and its information moved to Docs/FileFormats/config.html
* VCodeSnip.vi: rejected changes in trunk and kept version in this branch.

Some files are physically unchanged and have changes only to their svn:mergeinfo property.

Merged trunk changes for release 3.8.7 (i.e. r1191, r1270 and r1271) into the v4-dev branch. Note that r1195 and r1257 had already been merged at an earlier date.

Made conflict resolution in VCodeSnip.vi by rejecting changes and keeping version in this branch.

Some files are physically unchanged and have changes only to their svn:mergeinfo property.

Updated svn:mergeinfo properties modified by last merge from trunk of r1195. There were no physical changes to the files.

Updated svn:mergeinfo properties modified by last merge from trunk of r1257. There were no physical changes to the files.

Merged trunk changes 1107, 1111 and 1182-1185 into the v4-dev branch.

Made conflict resolution changes by rejecting changes to affected files in all cases and keeping versions in this branch.

Some files are physically unchanged and have changes only to their svn:mergeinfo property.

Updated svn:mergeinfo properties modified by last merge from trunk. There were no physical changes to the files.

Merged trunk changes 1089-1093 and 1095 into the v4-dev branch.

Made conflict resolution changes.

Some files are physically unchanged and have changes only to their svn:mergeinfo property.

Development branch for CodeSnip release 4.

Initial source is a copy of v3.8.4 (r1075).