Menu

Commit [r4007]  Maximize  Restore  History

Merged revision(s) 3710-4006, 3314-3711 from trunk:

Updated with changes in trunk/Src after applying changes from release 4.8.4 to it.

Resolved conflicts with .vi files by ignoring merged changes. Other conflicts were resolved manually by mixing "theirs" with "mine" in a way that makes sense in parsnip.

delphidabbler 2013-11-28

changed /branches/parsnip
changed /branches/parsnip/Docs/ChangeLogs/ChangeLog-v4.txt
changed /branches/parsnip/Src
changed /branches/parsnip/Src/FmMain.dfm
changed /branches/parsnip/Src/FmSWAGImportDlg.dfm
changed /branches/parsnip/Src/FmSWAGImportDlg.pas
changed /branches/parsnip/Src/Help/HTML/dlg_savesnippet.htm
changed /branches/parsnip/Src/Help/HTML/dlg_swagimport.htm
changed /branches/parsnip/Src/Help/HTML/menu_edit.htm
changed /branches/parsnip/Src/Help/HTML/menu_file.htm
changed /branches/parsnip/Src/Help/HTML/quickstart.htm
changed /branches/parsnip/Src/Help/HTML/task_copysnippet.htm
changed /branches/parsnip/Src/Help/HTML/task_savesnippet.htm
changed /branches/parsnip/Src/Help/Index.hhk
changed /branches/parsnip/Src/Help/TOC.hhc
/branches/parsnip
Directory.
/branches/parsnip/Docs/ChangeLogs/ChangeLog-v4.txt Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/FmMain.dfm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/FmSWAGImportDlg.dfm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/FmSWAGImportDlg.pas Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/HTML/dlg_savesnippet.htm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/HTML/dlg_swagimport.htm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/HTML/menu_edit.htm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/HTML/menu_file.htm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/HTML/quickstart.htm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/HTML/task_copysnippet.htm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/HTML/task_savesnippet.htm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/Index.hhk Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/TOC.hhc 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.