Menu

Commit [r1189]  Maximize  Restore  History

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.

delphidabbler 2010-12-06

changed /branches/v4-dev
changed /branches/v4-dev/Build.html
changed /branches/v4-dev/Docs/ChangeLog.txt
changed /branches/v4-dev/Docs/SourceCodeLicenses.txt
changed /branches/v4-dev/Src/UActiveText.pas
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/Docs/SourceCodeLicenses.txt 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/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.