Răsfoiți Sursa

Merge 43103, removing conflict
------------------------------------------------------------------------
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 -

pierre 4 ani în urmă
părinte
comite
73feaf992c
1 a modificat fișierele cu 1 adăugiri și 1 ștergeri
  1. 1 1
      utils/fppkg/fpmake.pp

+ 1 - 1
utils/fppkg/fpmake.pp

@@ -31,7 +31,7 @@ begin
     P.Directory:=ADirectory;
     P.Directory:=ADirectory;
     P.Version:='3.2.1';
     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
     if Defaults.CPU=jvm then
       P.OSes := P.OSes - [java,android];
       P.OSes := P.OSes - [java,android];