C Makefile
C Makefile.fpc
--- Recording mergeinfo for merge of r49045 into '.':
U .
Summary of conflicts:
Text conflicts: 2
# revisions: 49045
r49045 | jonas | 2021-03-24 15:33:09 +0100 (Wed, 24 Mar 2021) | 1 line
Changed paths:
M /trunk/Makefile
M /trunk/Makefile.fpc
* support building with FPC 3.2.2
git-svn-id: branches/fixes_3_2@49384 -
U packages/pasjpeg/examples/example.pas
--- Recording mergeinfo for merge of r48428 into '.':
U .
--- Merging r48431 into '.':
A packages/pasjpeg/examples/demo.lpi
--- Recording mergeinfo for merge of r48431 into '.':
G .
--- Merging r48463 into '.':
U packages/graph/src/inc/graph.tex
--- Recording mergeinfo for merge of r48463 into '.':
G .
--- Merging r48115 into '.':
U packages/fv/src/views.pas
--- Recording mergeinfo for merge of r48115 into '.':
G .
# revisions: 48428,48431,48463,48115
r48428 | florian | 2021-01-25 22:29:14 +0100 (Mon, 25 Jan 2021) | 1 line
Changed paths:
M /trunk/packages/pasjpeg/examples/example.pas
* fix demo example for delphi_stream being defined
r48431 | florian | 2021-01-26 23:00:33 +0100 (Tue, 26 Jan 2021) | 1 line
Changed paths:
A /trunk/packages/pasjpeg/examples/demo.lpi
+ lazarus project for demo
r48463 | nickysn | 2021-01-31 12:08:21 +0100 (Sun, 31 Jan 2021) | 1 line
Changed paths:
M /trunk/packages/graph/src/inc/graph.tex
* set eol-style=native and mime-type=text/plain to graph.tex
r48115 | florian | 2021-01-08 17:33:05 +0100 (Fri, 08 Jan 2021) | 1 line
Changed paths:
M /trunk/packages/fv/src/views.pas
* avoid div by zero in TView.CalcBounds.GrowI, resolves#30922
git-svn-id: branches/fixes_3_2@48511 -
U packages/ide/fpmwnd.inc
U packages/ide/fpide.pas
--- Recording mergeinfo for merge of r40804 into '.':
U .
--- Merging r40811 into '.':
U packages/fv/src/editors.pas
U packages/fv/src/statuses.pas
U packages/fv/src/validate.pas
--- Recording mergeinfo for merge of r40811 into '.':
G .
# revisions: 40804,40811
r40804 | michael | 2019-01-08 05:15:38 +0100 (Tue, 08 Jan 2019) | 1 line
Changed paths:
M /trunk/packages/ide/fpide.pas
M /trunk/packages/ide/fpmwnd.inc
* Apply patch from Margers to fix bug ID #6496
r40811 | marco | 2019-01-09 11:18:36 +0100 (Wed, 09 Jan 2019) | 1 line
Changed paths:
M /trunk/packages/fv/src/editors.pas
M /trunk/packages/fv/src/statuses.pas
M /trunk/packages/fv/src/validate.pas
* patch from Margers that fixes parameter arrays formatstr, mantis 34839
git-svn-id: branches/fixes_3_2@41895 -
