paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-08 03:48:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 43103, removing conflict

Browse Source 
------------------------------------------------------------------------
r43103 | pierre | 2019-10-01 12:50:26 +0000 (Tue, 01 Oct 2019) | 1 line

 Remove symbian from fppkg OS list
------------------------------------------------------------------------
--- Merging r43103 into '.':
C    utils/fppkg/fpmake.pp
--- Recording mergeinfo for merge of r43103 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1

git-svn-id: branches/fixes_3_2@46924 -
This commit is contained in:
pierre 2020-09-23 11:39:55 +00:00
parent 0830edbde5
commit 73feaf992c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
utils/fppkg/fpmake.pp
View File

@ -31,7 +31,7 @@ begin
P.Directory:=ADirectory;
P.Version:='3.2.1';
P.OSes:=AllOSes-[embedded,msdos,win16,go32v2,nativent,macosclassic,palmos,atari];
P.OSes:=AllOSes-[embedded,msdos,win16,go32v2,nativent,macosclassic,palmos,atari,symbian];
if Defaults.CPU=jvm then
P.OSes := P.OSes - [java,android];