Menu

Commit [r3713]  Maximize  Restore  History

Merged revision(s) 3694-3712, 3314-3696 from trunk:

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

Resolved conflicts with .vi files by ignoring merged changes.
Conflicts in Docs/License.html were resolve by rejecting trunk changes. Equivalent changes to those made in trunk have already been applied in r3705.
Changes to Src/3rdParty directory in trunk were not merged because that directory does not exist in parsnip. Similar changes to contents of 3rdParty has already been made in parsnip in r3703.

delphidabbler 2013-11-07

changed /branches/parsnip
changed /branches/parsnip/Docs/ChangeLogs/ChangeLog-v0.txt
changed /branches/parsnip/Docs/ChangeLogs/ChangeLog-v1.txt
changed /branches/parsnip/Docs/ChangeLogs/ChangeLog-v2.txt
changed /branches/parsnip/Docs/ChangeLogs/ChangeLog-v3.txt
changed /branches/parsnip/Docs/ChangeLogs/ChangeLog-v4.txt
changed /branches/parsnip/Src
changed /branches/parsnip/Src/Compilers.UBorland.pas
changed /branches/parsnip/Src/Help/HTML/dlg_moveuserdb.htm
changed /branches/parsnip/Src/USystemInfo.pas
/branches/parsnip
Directory.
/branches/parsnip/Docs/ChangeLogs/ChangeLog-v0.txt Diff Switch to side-by-side view
Loading...
/branches/parsnip/Docs/ChangeLogs/ChangeLog-v1.txt Diff Switch to side-by-side view
Loading...
/branches/parsnip/Docs/ChangeLogs/ChangeLog-v2.txt Diff Switch to side-by-side view
Loading...
/branches/parsnip/Docs/ChangeLogs/ChangeLog-v3.txt Diff Switch to side-by-side view
Loading...
/branches/parsnip/Docs/ChangeLogs/ChangeLog-v4.txt Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Compilers.UBorland.pas Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/Help/HTML/dlg_moveuserdb.htm Diff Switch to side-by-side view
Loading...
/branches/parsnip/Src/USystemInfo.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.