Merged revision(s) 4619-4624 from tags/version-4.11.0/Src/FmCodeSubmitDlg.dfm:
Merged revision(s) 4553-4624 from tags/version-4.11.0/Src/HTML.hrc:
Merged revision(s) 4619-4624 from tags/version-4.11.0/Src/Help/CodeSnip.hhp:
Merged revision(s) 4553-4618 from tags/version-4.11.0/Src/Help/HTML/dlg_submit.htm:
Merged revision(s) 4619-4624 from tags/version-4.11.0/Src/USaveUnitMgr.pas:
Merged revision(s) 4619-4624 from tags/version-4.11.0/Src/USnippetDoc.pas:
Merged revision(s) 4619-4624 from tags/version-4.11.0/Src/Help/HTML/task_submit.htm:
Merged revision(s) 4553-4624 from tags/version-4.11.0/Src/FrDisplayPrefs.pas:
Merged revision(s) 4553-4618 from tags/version-4.11.0/Src/FrDisplayPrefs.dfm:
Merged revision(s) 4553-4624 from tags/version-4.11.0/Src/Help/HTML/privacy_statement.htm:
Merged revision(s) 4553-4624 from tags/version-4.11.0/Docs/Privacy.txt:
Merged revision(s) 4553-4618 from tags/version-4.11.0/Src/UFileUpdater.pas:
Merged revision(s) 3314-4624 from tags/version-4.11.0/Src/Web.UDBDownloadMgr.pas:
Ignored revision(s) 4619-4624 from tags/version-4.11.0/Src/USnippetSourceGen.pas:
Copied and added new files from tags/version-4.11.0:
* Src/Help/HTML/submission-rights.htm
* Src/Res/HTML/dlg-codesubmit-finished.html
* Src/Res/HTML/dlg-codesubmit-intro.html
* Src/Res/HTML/dlg-codesubmit-license.html
* Src/Res/HTML/dlg-codesubmit-submit.html
This sequence of merges and file copies brings parsnip branch into line with release 4.11.0, as far as is possible.
Unlike v4.x which can determine whether Code Snippets Database code is present in generated code and add MIT license if so, parsnip has removed the ability to detect Code Snippets Database code, so can't mention MIT license in generated code.
Some unused resource strings relating to licensing have been updated as a result of this commit. They are in the following files:
* USaveUnitMgr.pas
* USnippetDoc.pas