CodeSnip Old Code (SVN)

Merged trunk changes for release 3.9.1 (i.e. 1558-1562) into the v4-dev branch.

Resolved conflicts as follows:

* Src/VCodeSnip.vi: kept version in v4-dev unchanged.

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

Merged trunk changes for release 3.9.0 (i.e. 1507-1510, 1546-1553) into the
v4-dev branch.

Resolved conflicts as follows:

* Src/Help/HTML/dlg_configcompilers.htm: added reference to Delphi XE2 to v4-dev version of document.
* Missing Src/UIniDataReader.pas: manually added changes to equivalent v4-dev file Src/DBIO.UIniDataReader.pas.
* Src/VCodeSnip.vi: kept version in v4-dev unchanged.

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

Merged trunk changes for release 3.8.11 (i.e. r1429, r1501-1504) into the v4-dev branch.

Resolved conflicts for both Browser.UIOMgr.pas and VCodeSnip.vi by keeping v4-dev branch versions unchanged.

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

* Renamed StrTrim*Spaces routines in UStrUtils unit to StrTrim*.
* Renamed DUnit test methods in TestUStrUtils to suit renamed routines.
* Updated all affected code.

* Added new UStrUtils StrTrim*Spaces routines.
* Replaced all Replaced all SysUtils Trim* routine calls with new StrTrim*Spaces calls.
* Moved UUtils TrimChar* routines to UStrUtils and renamed as StrTrim*Chars and updated calling code.

Merged trunk changes for release 3.8.10 (i.e. r1320, r1321, r1418, r1419, 1421 to 1427) into the v4-dev branch.

Resolved conflicts. Most by using selected entries from each file. Except that v4-dev brach's version of VCodeSnip.vi kept unchanged.

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

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.