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/ptc/src/ptcwrapper/ptcwrapper.pp
--- Recording mergeinfo for merge of r47236 into '.':
U .
--- Merging r47458 into '.':
U packages/graph/src/ptcgraph/ptcgraph.pp
--- Recording mergeinfo for merge of r47458 into '.':
G .
# revisions: 47236,47458
r47236 | michael | 2020-10-28 15:12:28 +0100 (Wed, 28 Oct 2020) | 1 line
Changed paths:
M /trunk/packages/ptc/src/ptcwrapper/ptcwrapper.pp
* Fix bug #38003, small memleak
r47458 | nickysn | 2020-11-19 18:59:21 +0100 (Thu, 19 Nov 2020) | 3 lines
Changed paths:
M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp
+ added function InstallUserMode to ptcgraph, that allows you to register a custom resolution and thus, open a custom window size
git-svn-id: branches/fixes_3_2@47648 -
U packages/fpmake_add.inc
U packages/fpmake_proc.inc
A packages/vcl-compat
A packages/vcl-compat/Makefile
A packages/vcl-compat/Makefile.fpc
A packages/vcl-compat/fpmake.pp
A packages/vcl-compat/src
A packages/vcl-compat/src/System.NetEncoding.pp
A packages/vcl-compat/tests
A packages/vcl-compat/tests/tcnetencoding.pp
A packages/vcl-compat/tests/testcompat.lpi
A packages/vcl-compat/tests/testcompat.lpr
--- Recording mergeinfo for merge of r42937 into '.':
U .
--- Merging r42939 into '.':
U packages/vcl-compat/fpmake.pp
--- Recording mergeinfo for merge of r42939 into '.':
G .
--- Merging r42975 into '.':
U packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r42975 into '.':
G .
--- Merging r42976 into '.':
U rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r42976 into '.':
G .
--- Merging r43058 into '.':
U utils/fpcm/fpmake.pp
--- Recording mergeinfo for merge of r43058 into '.':
G .
--- Merging r43059 into '.':
U packages/graph/src/ptcgraph/ptcmouse.pp
U packages/ptc/docs/CHANGES.txt
U packages/ptc/src/ptcwrapper/ptcwrapper.pp
--- Recording mergeinfo for merge of r43059 into '.':
G .
--- Merging r43085 into '.':
G packages/vcl-compat/fpmake.pp
A packages/vcl-compat/src/system.netencoding.pp
D packages/vcl-compat/src/System.NetEncoding.pp
--- Recording mergeinfo for merge of r43085 into '.':
G .
--- Merging r43086 into '.':
G packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r43086 into '.':
G .
# revisions: 42937,42939,42975,42976,43058,43059,43085,43086
git-svn-id: branches/fixes_3_2@43173 -
- rm winapi constants that were already included in fpc 2.6.2
* winapi constants that were included in fpc trunk put behind {$ifdef ver2_6}
git-svn-id: trunk@25775 -
