Menu

Commit [r1555]  Maximize  Restore  History

Merged trunk changes for release 3.9.0 (i.e. 1507-1510, 1546-1553) into the

v4-dev branch.

Resolved conflicts as follows:

* Src/Help/HTML/dlg_configcompilers.htm: added reference to Delphi XE2 to v4-dev version of document.
* Missing Src/UIniDataReader.pas: manually added changes to equivalent v4-dev file Src/DBIO.UIniDataReader.pas.
* Src/VCodeSnip.vi: kept version in v4-dev unchanged.

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

delphidabbler 2011-09-07

changed /branches/v4-dev
changed /branches/v4-dev/Build.html
changed /branches/v4-dev/Docs/ChangeLog.txt
changed /branches/v4-dev/Docs/ReadMe.txt
changed /branches/v4-dev/Src/Compilers.UBDS.pas
changed /branches/v4-dev/Src/Compilers.UGlobals.pas
changed /branches/v4-dev/Src/DBIO.UIniDataReader.pas
changed /branches/v4-dev/Src/FmRegistrationDlg.dfm
changed /branches/v4-dev/Src/FrCodeGenPrefs.pas
changed /branches/v4-dev/Src/Help/HTML/about_compiler_checks.htm
changed /branches/v4-dev/Src/Help/HTML/dlg_configcompilers.htm
changed /branches/v4-dev/Src/UActiveText.pas
changed /branches/v4-dev/Src/USimpleDispatch.pas
changed /branches/v4-dev/Src/UXMLDocConsts.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/ReadMe.txt Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/Compilers.UBDS.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/Compilers.UGlobals.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/DBIO.UIniDataReader.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmRegistrationDlg.dfm Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FrCodeGenPrefs.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/Help/HTML/about_compiler_checks.htm Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/Help/HTML/dlg_configcompilers.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/USimpleDispatch.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/UXMLDocConsts.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.