Menu

Commit [r1301]  Maximize  Restore  History

Merged trunk changes for release 3.8.8 (i.e. r1284 to r1299) into the v4-dev branch.

Resolved conflicts:
* missing Doc/Design/ConfigFileStructure.odt by in v4-dev is correct - the file has been deleted and its information moved to Docs/FileFormats/config.html
* VCodeSnip.vi: rejected changes in trunk and kept version in this branch.

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

delphidabbler 2011-01-19

1 2 > >> (Page 1 of 2)
changed /branches/v4-dev
changed /branches/v4-dev/Build.html
changed /branches/v4-dev/Docs/ChangeLog.txt
changed /branches/v4-dev/Docs/License.rtf
changed /branches/v4-dev/Docs/License.txt
changed /branches/v4-dev/Src/CodeSnip.dpr
changed /branches/v4-dev/Src/CodeSnip.dproj
changed /branches/v4-dev/Src/CodeSnip.todo
changed /branches/v4-dev/Src/FmBugReportBaseDlg.pas
changed /branches/v4-dev/Src/FmFindXRefsDlg.pas
changed /branches/v4-dev/Src/FmGenericOKDlg.pas
changed /branches/v4-dev/Src/FmGenericViewDlg.pas
changed /branches/v4-dev/Src/FmNewsDlg.dfm
changed /branches/v4-dev/Src/FmNewsDlg.pas
changed /branches/v4-dev/Src/FmPreferencesDlg.dfm
changed /branches/v4-dev/Src/FmPrintDlg.pas
changed /branches/v4-dev/Src/FmTrappedBugReportDlg.pas
changed /branches/v4-dev/Src/FmUpdateDlg.pas
changed /branches/v4-dev/Src/FmWizardDlg.pas
changed /branches/v4-dev/Src/FrHiliterPrefs.pas
changed /branches/v4-dev/Src/Help/CodeSnip.hhp
changed /branches/v4-dev/Src/Help/HTML/dlg_news.htm
changed /branches/v4-dev/Src/Help/HTML/dlg_preferences.htm
copied /trunk/Src/FrNewsPrefs.dfm -> /branches/v4-dev/Src/FrNewsPrefs.dfm
copied /trunk/Src/FrNewsPrefs.pas -> /branches/v4-dev/Src/FrNewsPrefs.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/License.rtf
Binary file was changed.
/branches/v4-dev/Docs/License.txt Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/CodeSnip.dpr Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/CodeSnip.dproj Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/CodeSnip.todo Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmBugReportBaseDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmFindXRefsDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmGenericOKDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmGenericViewDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmNewsDlg.dfm Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmNewsDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmPreferencesDlg.dfm Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmPrintDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmTrappedBugReportDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmUpdateDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FmWizardDlg.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/FrHiliterPrefs.pas Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/Help/CodeSnip.hhp Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/Help/HTML/dlg_news.htm Diff Switch to side-by-side view
Loading...
/branches/v4-dev/Src/Help/HTML/dlg_preferences.htm Diff Switch to side-by-side view
Loading...
1 2 > >> (Page 1 of 2)
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.