Menu

Commit [r1319]  Maximize  Restore  History

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.

delphidabbler 2011-05-10

changed /branches/v4-dev
changed /branches/v4-dev/Build.html
changed /branches/v4-dev/Docs/ChangeLog.txt
changed /branches/v4-dev/Src/FmBase.pas
changed /branches/v4-dev/Src/FmEditTextDlg.dfm
changed /branches/v4-dev/Src/FmEditTextDlg.pas
changed /branches/v4-dev/Src/UActiveText.pas
changed /branches/v4-dev/Src/UCodeImportMgr.pas
changed /branches/v4-dev/Src/UIniDataReader.pas
changed /branches/v4-dev/Src/VCodeSnip.vi
changed /branches/v4-dev/Src/Web.UDBDownloadMgr.pas
/branches/v4-dev
Directory.
/branches/v4-dev/Build.html Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Docs/ChangeLog.txt Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmBase.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmEditTextDlg.dfm Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmEditTextDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/UActiveText.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/UCodeImportMgr.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/UIniDataReader.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/VCodeSnip.vi Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/Web.UDBDownloadMgr.pas Diff Switch to side-by-side view
Loading...
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.