CodeSnip Old Code (SVN)

Merged revision(s) 3694-3712, 3314-3696 from trunk:

Updated with changes in trunk/Src after applying changes from release 4.8.3 to it.

Resolved conflicts with .vi files by ignoring merged changes.
Conflicts in Docs/License.html were resolve by rejecting trunk changes. Equivalent changes to those made in trunk have already been applied in r3705.
Changes to Src/3rdParty directory in trunk were not merged because that directory does not exist in parsnip. Similar changes to contents of 3rdParty has already been made in parsnip in r3703.

Removed PJShellFolders.pas as exception to MPL 2.0 licensing for ddab-lib code.

Merged revision(s) 3682-3697, 3314-3682 from trunk:

The only change in trunk since the last merge just updated the v3 changelog with details of release 3.13.2.

Merged revision(s) 3581-3683, 3314-3582 from trunk:

Updated with changes in trunk/Src after applying changes from release 4.8.2 to it.

Resolved conflicts with .vi files by ignoring merged changes.
Changes to PJSysInfo.pas in trunk were not merged because that unit is in a different location in parsnip.
Changes to UFontHelper.pas in trunk were identical to changes already made in parsnip, so the file was not changed in parsnip.

The outcome of the merge was simply to update the v4 change log.

Merged revision(s) 3456-3583, 3314-3458 from trunk:

Updated with changes in trunk/Src after applying changes from release 4.8.1 to it.

Resolved conflicts with .vi files by ignoring merged changes.

Updated re replacement of [Prefs:Printing] section of user config file with new [Printing] section.

Noted addition of current themes to Prefs:Hiliter section.
Noted user config file version has been bumped to v16.

Noted revised rules for composition of valid language, theme, brush and attribute identifiers.

Updated re change in requirements for a valid brush ID.

Fixed a broken anchor link.