Menu

Commit [r1098]  Maximize  Restore  History

Merged trunk changes 1089-1093 and 1095 into the v4-dev branch.

Made conflict resolution changes.

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

delphidabbler 2010-11-28

changed /branches/v4-dev
changed /branches/v4-dev/Build.html
changed /branches/v4-dev/Docs/ChangeLog.txt
changed /branches/v4-dev/Docs/Design/UserDataFileFormat.odt
changed /branches/v4-dev/Src/Help/HTML/dlg_editsnippet.htm
changed /branches/v4-dev/Src/UActiveText.pas
changed /branches/v4-dev/Src/UDetailPageHTML.pas
changed /branches/v4-dev/Src/USnippetValidator.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/Src/Help/HTML/dlg_editsnippet.htm 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/UDetailPageHTML.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/USnippetValidator.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.