paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-10 22:09:18 +02:00
Code Issues Packages Projects Releases Wiki Activity
44,659 Commits 101 Branches 76 Tags 313 MiB
fcc86b7b3a
Commit Graph

44659 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonas Maebe
fcc86b7b3a Merged immediately, because this file is no longer used/tested by trunk, and 
when it's used for bootstrapping then the changed code isn't used (it's only
used when linking to dynamic libraries without linking to libc)

--- Merging r33045 into '.':
U    rtl/linux/powerpc64/prt0.as
--- Recording mergeinfo for merge of r33045 into '.':
 U   .

git-svn-id: branches/fixes_3_0@33046 -
 2016-02-04 11:41:18 +00:00
marco
ad1cae9f84 * merged ide copyright. 
git-svn-id: branches/fixes_3_0@32933 -
 2016-01-13 09:13:54 +00:00
Jonas Maebe
c7b40a6436 --- Merging r31191 into '.': 
A    tests/webtbs/tw28475.pp
U    compiler/ncnv.pas
--- Merging r31193 into '.':
U    compiler/optcse.pas
A    tests/webtbs/tw27210.pp
--- Merging r31263 into '.':
U    compiler/options.pas
--- Merging r31335 into '.':
U    compiler/dbgdwarf.pas
--- Merging r31466 into '.':
U    compiler/arm/narmset.pas
--- Merging r31488 into '.':
U    rtl/inc/astrings.inc
--- Merging r31572 into '.':
U    compiler/arm/aasmcpu.pas
--- Merging r31608 into '.':
U    compiler/x86/nx86cal.pas
--- Merging r31680 into '.':
U    packages/chm/src/chmcmd.lpr
--- Merging r31851 into '.':
U    rtl/jvm/math.inc
--- Merging r31956 into '.':
U    tests/tbs/tb0320.pp
--- Merging r31976 into '.':
U    rtl/linux/x86_64/cprt0.as
--- Merging r31980 into '.':
U    compiler/systems/t_linux.pas
--- Merging r32043 into '.':
U    compiler/cclasses.pas
--- Merging r32066 into '.':
G    rtl/inc/astrings.inc
A    tests/webtbs/tw28850.pp
--- Merging r32168 into '.':
U    rtl/unix/cthreads.pp
--- Merging r32244 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
--- Merging r32259 into '.':
U    compiler/x86/agx86int.pas
--- Merging r32338 into '.':
G    compiler/ncnv.pas
--- Merging r32342 into '.':
G    compiler/ncnv.pas
--- Merging r32368 into '.':
A    tests/webtbs/tw29040.pp
U    compiler/x86/rax86int.pas
--- Merging r32399 into '.':
U    packages/fcl-res/src/machodefaulttarget.inc
--- Merging r32410 into '.':
U    compiler/ncgset.pas
--- Merging r32454 into '.':
U    compiler/jvm/pjvm.pas
U    tests/test/jvm/testall.bat
A    tests/test/jvm/tprocvaranon.pp
U    tests/test/jvm/testall.sh
--- Merging r32517 into '.':
U    compiler/nutils.pas
U    compiler/pexpr.pas
A    tests/webtbs/tw29030.pp
--- Merging r32527 into '.':
U    rtl/linux/powerpc64/gprt0.as
U    rtl/linux/powerpc64/cprt0.as
--- Merging r32528 into '.':
U    rtl/linux/powerpc64/prt0.as
--- Merging r32549 into '.':
U    compiler/jvm/njvmcon.pas
U    compiler/jvm/njvmcnv.pascd ..
--- Merging r32584 into '.':
U    compiler/utils/ppuutils/ppudump.pp
--- Merging r32599 into '.':
U    compiler/paramgr.pas

git-svn-id: branches/fixes_3_0@32671 -
 2015-12-16 15:28:03 +00:00
Jonas Maebe
cb6fd57009 --- Merging r30110 into '.': 
U    compiler/mips/aoptcpu.pas

git-svn-id: branches/fixes_3_0@32666 -
 2015-12-14 12:53:53 +00:00
Jonas Maebe
e0ca083cce --- Merging r30038 into '.': 
U    compiler/ncgvmt.pas
--- Merging r30217 into '.':
U    compiler/comprsrc.pas
--- Merging r30261 into '.':
A    tests/webtbs/tw27691.pp
U    compiler/pmodules.pas
--- Merging r30265 into '.':
U    compiler/fmodule.pas
G    compiler/pmodules.pas
--- Merging r30272 into '.':
A    tests/webtbs/tw27517.pp
U    compiler/pexpr.pas
--- Merging r30427 into '.':
U    compiler/x86/cpubase.pas
--- Merging r30465 into '.':
U    compiler/utils/ppuutils/ppudump.pp
--- Merging r30487 into '.':
U    rtl/inc/cgenstr.inc
--- Merging r30502 into '.':
U    compiler/x86/nx86inl.pas
U    compiler/arm/narminl.pas
U    compiler/ppcgen/ngppcinl.pas
A    tests/webtbs/tw27811.pp
--- Merging r30656 into '.':
U    compiler/psub.pas
--- Merging r30765 into '.':
U    compiler/arm/narmcnv.pas
U    compiler/sparc/ncpucnv.pas
U    compiler/m68k/n68kcnv.pas
U    compiler/mips/ncpucnv.pas
U    compiler/ppcgen/ngppccnv.pas
   C compiler/aarch64/ncpucnv.pas
A    tests/webtbs/tw28007.pp

git-svn-id: branches/fixes_3_0@32665 -
 2015-12-14 12:36:29 +00:00
Jonas Maebe
aa5e9d4746 --- Merging r29471 into '.': 
U    compiler/aasmbase.pas
--- Recording mergeinfo for merge of r29471 into '.':
 U   .
--- Merging r30220 into '.':
U    tests/utils/dotest.pp
--- Recording mergeinfo for merge of r30220 into '.':
 G   .

git-svn-id: branches/fixes_3_0@32631 -
 2015-12-10 22:12:28 +00:00
Jonas Maebe
e926169fcb - Merging r29456 into '.': 
A    tests/webtbs/tw27256.pp
U    compiler/ncal.pas
U    compiler/nadd.pas
--- Merging r29495 into '.':
G    compiler/ncal.pas
--- Merging r29584 into '.':
U    compiler/utils/ppuutils/ppudump.pp
U    compiler/psub.pas
U    compiler/globtype.pas
G    compiler/ncal.pas
--- Merging r29585 into '.':
U    rtl/unix/oscdecl.inc
U    rtl/unix/oscdeclh.inc
U    rtl/linux/osmacro.inc
--- Merging r29586 into '.':
U    tests/utils/dotest.pp
--- Merging r29616 into '.':
A    tests/webtbs/tw26534a.pp
A    tests/webtbs/tw26534b.pp
A    tests/webtbs/tw24796.pp
G    compiler/ncal.pas
--- Merging r29641 into '.':
U    compiler/optdfa.pas
--- Merging r29686 into '.':
A    tests/test/tobjc42.pp
A    tests/test/uobjc42.pp
U    compiler/symdef.pas
--- Merging r29792 into '.':
U    compiler/finput.pas
--- Merging r29793 into '.':
A    tests/webtbs/tw14347.pp

git-svn-id: branches/fixes_3_0@32621 -
 2015-12-09 14:34:24 +00:00
joost
a1e6cab872 --- Merging r32274 into '.': 
U    packages/fppkg/src/fpmkunitsrc.inc
--- Recording mergeinfo for merge of r32274 into '.':
 U   .

# revisions: 32274

git-svn-id: branches/fixes_3_0@32295 -
 2015-11-12 18:12:54 +00:00
joost
3156da8c06 --- Merging r32224 into '.': 
U    packages/fppkg/src/pkgmessages.pp
U    packages/fppkg/src/pkgcommands.pp
U    utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r32224 into '.':
 U   .

# revisions: 3222

git-svn-id: branches/fixes_3_0@32273 -
 2015-11-08 17:17:50 +00:00
joost
71ec0ce6cb --- Merging r32253 into '.': 
U    packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r32253 into '.':
 U   .

# revisions: 32253

git-svn-id: branches/fixes_3_0@32272 -
 2015-11-08 17:16:23 +00:00
joost
aef7142f34 --- Merging r31480 into '.': 
U    rtl/inc/ustrings.inc
A    tests/webtbs/tw28593.pp
--- Recording mergeinfo for merge of r31480 into '.':
 U   .

# revisions: 31480

git-svn-id: branches/fixes_3_0@32261 -
 2015-11-06 20:37:21 +00:00
joost
f2e27b2585 --- Merging r32202 into '.': 
A    tests/webtbs/tw28934.pp
C    compiler/widestr.pas
--- Recording mergeinfo for merge of r32202 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1
Summary of conflicts:
  Text conflicts: 1

# revisions: 32202

git-svn-id: branches/fixes_3_0@32260 -
 2015-11-06 20:13:22 +00:00
joost
7460d4d61f --- Merging r32143 into '.': 
U    packages/hash/fpmake.pp
--- Recording mergeinfo for merge of r32143 into '.':
 U   .
--- Merging r32144 into '.':
U    packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r32144 into '.':
 G   .
--- Merging r32145 into '.':
U    packages/fcl-registry/fpmake.pp
--- Recording mergeinfo for merge of r32145 into '.':
 G   .
--- Merging r32146 into '.':
U    packages/gtk2/fpmake.pp
--- Recording mergeinfo for merge of r32146 into '.':
 G   .
--- Merging r32147 into '.':
U    packages/winunits-jedi/fpmake.pp
--- Recording mergeinfo for merge of r32147 into '.':
 G   .

# revisions: 32143,32144,32145,32146,32147

git-svn-id: branches/fixes_3_0@32243 -
 2015-11-04 21:22:21 +00:00
joost
54cdefa707 --- Merging r32142 into '.': 
U    packages/svgalib/fpmake.pp
U    packages/libndsfpc/fpmake.pp
U    packages/regexpr/fpmake.pp
U    packages/libogcfpc/fpmake.pp
U    packages/postgres/fpmake.pp
U    packages/os2units/fpmake.pp
U    packages/libxml/fpmake.pp
U    packages/libcurl/fpmake.pp
U    packages/gtk2/fpmake.pp
U    packages/odbc/fpmake.pp
U    packages/syslog/fpmake.pp
U    packages/libgd/fpmake.pp
U    packages/ibase/fpmake.pp
U    packages/fpmkunit/src/fpmkunit.pp
U    packages/opengles/fpmake.pp
U    packages/fcl-base/fpmake.pp
U    packages/gmp/fpmake.pp
U    packages/uuid/fpmake.pp
U    packages/libgbafpc/fpmake.pp
U    packages/ptc/fpmake.pp
U    ide/fpmake.pp
--- Recording mergeinfo for merge of r32142 into '.':
 U   .

# revisions: 32142

git-svn-id: branches/fixes_3_0@32242 -
 2015-11-04 21:17:00 +00:00
joost
fe336c38d4 --- Merging r32124 into '.': 
U    packages/gdbint/fpmake.pp
--- Recording mergeinfo for merge of r32124 into '.':
 U   .
--- Merging r32126 into '.':
U    packages/gtk2/fpmake.pp
--- Recording mergeinfo for merge of r32126 into '.':
 G   .
--- Merging r32127 into '.':
U    packages/imagemagick/fpmake.pp
--- Recording mergeinfo for merge of r32127 into '.':
 G   .
--- Merging r32128 into '.':
U    packages/rtl-unicode/fpmake.pp
--- Recording mergeinfo for merge of r32128 into '.':
 G   .
--- Merging r32129 into '.':
U    packages/fcl-sdo/fpmake.pp
--- Recording mergeinfo for merge of r32129 into '.':
 G   .
--- Merging r32138 into '.':
U    packages/fppkg/fpmake.pp
--- Recording mergeinfo for merge of r32138 into '.':
 G   .
--- Merging r32139 into '.':
U    packages/libxml/fpmake.pp
--- Recording mergeinfo for merge of r32139 into '.':
 G   .

# revisions: 32124,32126,32127,32128,32129,32138,32139

git-svn-id: branches/fixes_3_0@32241 -
 2015-11-04 21:11:04 +00:00
joost
6880ce93e8 --- Merging r32118 into '.': 
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r32118 into '.':
 U   .

# revisions: 32118

git-svn-id: branches/fixes_3_0@32240 -
 2015-11-04 21:04:23 +00:00
joost
89a93e4870 --- Merging r32074 into '.': 
U    packages/rtl-objpas/fpmake.pp
--- Recording mergeinfo for merge of r32074 into '.':
 U   .
--- Merging r32119 into '.':
U    packages/aspell/fpmake.pp
--- Recording mergeinfo for merge of r32119 into '.':
 G   .
--- Merging r32120 into '.':
U    packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r32120 into '.':
 G   .
--- Merging r32121 into '.':
U    packages/chm/fpmake.pp
--- Recording mergeinfo for merge of r32121 into '.':
 G   .
--- Merging r32123 into '.':
U    packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r32123 into '.':
 G   .

# revisions: 32074,32119,32120,32121,32123

git-svn-id: branches/fixes_3_0@32239 -
 2015-11-04 20:59:27 +00:00
joost
d905195297 --- Merging r32071 into '.': 
U    utils/fppkg/fppkg.pp
--- Recording mergeinfo for merge of r32071 into '.':
 U   .

# revisions: 32071

git-svn-id: branches/fixes_3_0@32238 -
 2015-11-04 20:54:34 +00:00
joost
bf757c0c15 --- Merging r32053 into '.': 
U    packages/fppkg/src/pkgglobals.pp
--- Recording mergeinfo for merge of r32053 into '.':
 U   .

# revisions: 32053

git-svn-id: branches/fixes_3_0@32237 -
 2015-11-04 20:50:20 +00:00
joost
c08bf036c4 --- Merging r32038 into '.': 
U    packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r32038 into '.':
 U   .

# revisions: 32038

git-svn-id: branches/fixes_3_0@32236 -
 2015-11-04 20:47:49 +00:00
joost
7be59503ea --- Merging r31362 into '.': 
U    rtl/haiku/Makefile.fpc
U    compiler/systems/t_haiku.pas
--- Recording mergeinfo for merge of r31362 into '.':
 U   .
--- Merging r31364 into '.':
A    rtl/haiku/i386/dllcprt0.as
--- Recording mergeinfo for merge of r31364 into '.':
 G   .

# revisions: 31362,31364

git-svn-id: branches/fixes_3_0@32230 -
 2015-11-04 20:20:37 +00:00
joost
cfcf2f5b24 --- Merging r31333 into '.': 
U    rtl/unix/unixcp.pp
--- Recording mergeinfo for merge of r31333 into '.':
 U   .

# revisions: 31333

git-svn-id: branches/fixes_3_0@32229 -
 2015-11-04 19:57:35 +00:00
joost
47963b9189 --- Merging r31331 into '.': 
C    rtl/haiku/Makefile
--- Recording mergeinfo for merge of r31331 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1
Summary of conflicts:
  Text conflicts: 1

# revisions: 31331

git-svn-id: branches/fixes_3_0@32228 -
 2015-11-04 19:48:13 +00:00
joost
d5e7a3ed4a --- Merging r31330 into '.': 
U    rtl/haiku/Makefile.fpc
--- Recording mergeinfo for merge of r31330 into '.':
 U   .

# revisions: 31330

git-svn-id: branches/fixes_3_0@32227 -
 2015-11-04 19:43:50 +00:00
joost
57e7d48cbd --- Merging r31332 into '.': 
C    packages/rtl-unicode/fpmake.pp
--- Recording mergeinfo for merge of r31332 into '.':
 U   .

# revisions: 31332

git-svn-id: branches/fixes_3_0@32219 -
 2015-11-01 20:46:02 +00:00
joost
d2853f5962 --- Merging r31329 into '.': 
U    rtl/unix/cwstring.pp
--- Recording mergeinfo for merge of r31329 into '.':
 U   .

# revisions: 31329

git-svn-id: branches/fixes_3_0@32218 -
 2015-11-01 20:41:14 +00:00
joost
12f41dfb0c --- Merging r31427 into '.': 
U    rtl/haiku/ptypes.inc
U    rtl/unix/cwstring.pp
--- Recording mergeinfo for merge of r31427 into '.':
 U   .

# revisions: 31427

git-svn-id: branches/fixes_3_0@32217 -
 2015-11-01 20:36:37 +00:00
yury
e0fdaeca41 Merged revision(s) 32083 from trunk: 
* pas2jni: Fixed reading of the ppudump's output in some cases.
........

git-svn-id: branches/fixes_3_0@32085 -
 2015-10-17 20:39:08 +00:00
yury
1617b9e95b Merged revision(s) 32072, 32078 from trunk: 
* arm-android: Use kuser_cmpxchg for Interlocked* functions when RTL is compiled for the ARMv5t CPU.
........
* arm-android: Compile for ARMv5T by default to be compatible with all versions of Android.
........

git-svn-id: branches/fixes_3_0@32080 -
 2015-10-17 16:37:28 +00:00
yury
bb42a1a2a0 Merged revision(s) 32063 from trunk: 
fix InterlockedCompareExchange on ARM-Linux: kuser_cmpxchg destroys r3, which needs to be restored, if we have to loop
........

git-svn-id: branches/fixes_3_0@32079 -
 2015-10-17 16:35:32 +00:00
joost
9c719ab1e1 --- Merging r31986 into '.': 
U    rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r31986 into '.':
 U   .

# revisions: 31986

git-svn-id: branches/fixes_3_0@32051 -
 2015-10-13 17:45:07 +00:00
joost
6543ae75c9 --- Merging r32019 into '.': 
U    rtl/os2/sysutils.pp
--- Recording mergeinfo for merge of r32019 into '.':
 U   .

# revisions: 32019

git-svn-id: branches/fixes_3_0@32027 -
 2015-10-12 17:53:56 +00:00
joost
545619758f * Re-generated Makefile's 
git-svn-id: branches/fixes_3_0@32002 -
 2015-10-10 20:05:14 +00:00
joost
7cd5b16965 --- Merging r31974 into '.': 
U    ide/fpmake.pp
--- Recording mergeinfo for merge of r31974 into '.':
 U   .
--- Merging r31975 into '.':
G    ide/fpmake.pp
--- Recording mergeinfo for merge of r31975 into '.':
 G   .
--- Merging r31999 into '.':
G    ide/fpmake.pp
--- Recording mergeinfo for merge of r31999 into '.':
 G   .

# revisions: 31974,31975,31999

git-svn-id: branches/fixes_3_0@32000 -
 2015-10-09 19:46:45 +00:00
joost
e8a1c4f562 --- Merging r31831 into '.': 
A    tests/webtbs/tw28718b.pp
A    tests/webtbs/tw28718d.pp
A    tests/webtbs/tw28718a.pp
A    tests/webtbs/tw28718c.pp
U    compiler/symdef.pas
U    compiler/scandir.pas
U    compiler/scanner.pas
U    compiler/options.pas
U    compiler/globtype.pas
--- Recording mergeinfo for merge of r31831 into '.':
 U   .
--- Merging r31880 into '.':
G    compiler/scanner.pas
--- Recording mergeinfo for merge of r31880 into '.':
 G   .

# revisions: 31831,31880

git-svn-id: branches/fixes_3_0@31997 -
 2015-10-09 18:47:20 +00:00
joost
51163d68fc --- Merging r29810 into '.': 
U    compiler/symdef.pas
--- Recording mergeinfo for merge of r29810 into '.':
 U   .

# revisions: 29810, adapted manually

git-svn-id: branches/fixes_3_0@31996 -
 2015-10-09 18:40:40 +00:00
joost
d8b82e0ba5 --- Merging r31910 into '.': 
U    compiler/ptype.pas
A    tests/webtbs/tw28674.pp
--- Recording mergeinfo for merge of r31910 into '.':
 U   .
--- Merging r31987 into '.':
U    tests/webtbs/tw28674.pp
G    compiler/ptype.pas
--- Recording mergeinfo for merge of r31987 into '.':
 G   .i

# revisions: 31910,31987

git-svn-id: branches/fixes_3_0@31995 -
 2015-10-09 16:38:40 +00:00
joost
cde218d81c --- Merging r31982 into '.': 
U    rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r31982 into '.':
 U   .

# revisions: 31982

git-svn-id: branches/fixes_3_0@31985 -
 2015-10-08 19:48:44 +00:00
joost
0f73688ecb --- Merging r31458 into '.': 
C    tests/test/jvm/testall.bat
C    tests/test/jvm/testall.sh
A    tests/test/jvm/tformalclass.pp
U    compiler/htypechk.pas
--- Recording mergeinfo for merge of r31458 into '.':
 U   .

# revisions: 31458

git-svn-id: branches/fixes_3_0@31984 -
 2015-10-08 19:24:18 +00:00
joost
69534dc58c --- Merging r31978 into '.': 
U   tests/test/jvm/testall.bat
 U   tests/test/jvm/testall.sh
--- Recording mergeinfo for merge of r31978 into '.':
 U   .

# revisions: 31978

git-svn-id: branches/fixes_3_0@31979 -
 2015-10-08 18:52:30 +00:00
joost
06b9bda86d --- Merging r31944 into '.': 
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r31944 into '.':
 U   .

# revisions: 31944

git-svn-id: branches/fixes_3_0@31973 -
 2015-10-06 22:20:46 +00:00
joost
6556feef8d --- Merging r31943 into '.': 
U    compiler/utils/samplecfg
--- Recording mergeinfo for merge of r31943 into '.':
 U   .

# revisions: 31943

git-svn-id: branches/fixes_3_0@31972 -
 2015-10-06 22:19:28 +00:00
joost
683d44e455 --- Merging r31400 into '.': 
C    packages/Makefile
U    packages/Makefile.fpc
--- Recording mergeinfo for merge of r31400 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1
Summary of conflicts:
  Text conflicts: 1

# revisions: 31400

git-svn-id: branches/fixes_3_0@31971 -
 2015-10-06 22:15:45 +00:00
joost
6329336c32 * Re-generated Makefiles 
git-svn-id: branches/fixes_3_0@31970 -
 2015-10-06 22:09:00 +00:00
joost
2174581f6c --- Merging r31317 into '.': 
C packages/googleapi
U    packages/nvapi/Makefile.fpc
U    packages/httpd13/Makefile.fpc
U    packages/proj4/Makefile.fpc
U    packages/odbc/Makefile.fpc
U    packages/openssl/Makefile.fpc
U    packages/rtl-unicode/Makefile.fpc
U    packages/fcl-sdo/Makefile.fpc
U    packages/libcurl/Makefile.fpc
U    packages/gtk1/Makefile.fpc
U    packages/libndsfpc/Makefile.fpc
U    packages/paszlib/Makefile.fpc
U    packages/cdrom/Makefile.fpc
U    packages/chm/Makefile.fpc
U    packages/fppkg/Makefile.fpc
U    packages/x11/Makefile.fpc
U    packages/regexpr/Makefile.fpc
U    packages/zorba/Makefile.fpc
U    packages/rtl-objpas/Makefile.fpc
U    packages/ldap/Makefile.fpc
U    packages/ncurses/Makefile.fpc
U    packages/hash/Makefile.fpc
U    packages/utmp/Makefile.fpc
U    packages/numlib/Makefile.fpc
U    packages/ami-extra/Makefile.fpc
U    packages/fcl-net/Makefile.fpc
U    packages/libogcfpc/Makefile.fpc
U    packages/fcl-res/Makefile.fpc
U    packages/imlib/Makefile.fpc
U    packages/dbus/Makefile.fpc
U    packages/imagemagick/Makefile.fpc
U    packages/graph/Makefile.fpc
U    packages/iosxlocale/Makefile.fpc
U    packages/unzip/Makefile.fpc
U    packages/postgres/Makefile.fpc
U    packages/fcl-fpcunit/Makefile.fpc
U    packages/fcl-process/Makefile.fpc
U    packages/fcl-image/Makefile.fpc
U    packages/os2units/Makefile.fpc
U    packages/libxml/Makefile.fpc
U    packages/fcl-stl/Makefile.fpc
   C packages/libenet
U    packages/libpng/Makefile.fpc
U    packages/gdbm/Makefile.fpc
U    packages/gtk2/Makefile.fpc
U    packages/fcl-web/Makefile.fpc
U    packages/pcap/Makefile.fpc
U    packages/httpd24/Makefile.fpc
U    packages/fuse/Makefile.fpc
U    packages/amunits/Makefile.fpc
U    packages/bzip2/Makefile.fpc
U    packages/bfd/Makefile.fpc
U    packages/libvlc/Makefile.fpc
U    packages/rtl-extra/Makefile.fpc
U    packages/rexx/Makefile.fpc
U    packages/mad/Makefile.fpc
U    packages/libgd/Makefile.fpc
U    packages/httpd22/Makefile.fpc
U    packages/oggvorbis/Makefile.fpc
U    packages/fcl-async/Makefile.fpc
U    packages/opengl/Makefile.fpc
U    packages/pasjpeg/Makefile.fpc
U    packages/morphunits/Makefile.fpc
U    packages/fcl-extra/Makefile.fpc
U    packages/objcrtl/Makefile.fpc
U    packages/syslog/Makefile.fpc
U    packages/httpd20/Makefile.fpc
U    packages/zlib/Makefile.fpc
U    packages/dblib/Makefile.fpc
U    packages/ibase/Makefile.fpc
U    packages/winunits-base/Makefile.fpc
U    packages/mysql/Makefile.fpc
U    packages/matroska/Makefile.fpc
U    packages/Makefile.fpc
U    packages/winunits-jedi/Makefile.fpc
U    packages/fpindexer/Makefile.fpc
U    packages/univint/Makefile.fpc
U    packages/libc/Makefile.fpc
U    packages/symbolic/Makefile.fpc
U    packages/gnome1/Makefile.fpc
U    packages/sqlite/Makefile.fpc
U    packages/jni/Makefile.fpc
U    packages/sdl/Makefile.fpc
U    packages/winceunits/Makefile.fpc
U    packages/libtar/Makefile.fpc
U    packages/opengles/Makefile.fpc
U    packages/fcl-base/Makefile.fpc
U    packages/fcl-xml/Makefile.fpc
U    packages/aspell/Makefile.fpc
U    packages/a52/Makefile.fpc
U    packages/fftw/Makefile.fpc
U    packages/fcl-json/Makefile.fpc
U    packages/ptc/Makefile.fpc
U    packages/rtl-console/Makefile.fpc
U    packages/ggi/Makefile.fpc
U    packages/fv/Makefile.fpc
U    packages/opencl/Makefile.fpc
U    packages/fastcgi/Makefile.fpc
U    packages/gmp/Makefile.fpc
U    packages/uuid/Makefile.fpc
U    packages/pthreads/Makefile.fpc
U    packages/unixutil/Makefile.fpc
U    packages/fcl-passrc/Makefile.fpc
U    packages/iconvenc/Makefile.fpc
U    packages/fcl-registry/Makefile.fpc
U    packages/newt/Makefile.fpc
U    packages/sndfile/Makefile.fpc
U    packages/openal/Makefile.fpc
U    packages/pastojs/Makefile.fpc
U    packages/oracle/Makefile.fpc
U    packages/libgbafpc/Makefile.fpc
U    packages/pxlib/Makefile.fpc
U    packages/dts/Makefile.fpc
U    packages/libsee/Makefile.fpc
U    packages/librsvg/Makefile.fpc
U    packages/palmunits/Makefile.fpc
U    packages/hermes/Makefile.fpc
U    packages/xforms/Makefile.fpc
U    packages/tcl/Makefile.fpc
U    packages/cocoaint/Makefile.fpc
U    packages/modplug/Makefile.fpc
U    packages/fcl-js/Makefile.fpc
U    packages/arosunits/Makefile.fpc
U    packages/users/Makefile.fpc
U    packages/gdbint/Makefile.fpc
U    packages/fpgtk/Makefile.fpc
U    packages/lua/Makefile.fpc
U    packages/fcl-db/Makefile.fpc
U    packages/cairo/Makefile.fpc
U    packages/fcl-sound/Makefile.fpc
U    packages/svgalib/Makefile.fpc
U    utils/fpcmkcfg/Makefile.fpc
U    utils/fpcm/Makefile.fpc
U    utils/tply/Makefile.fpc
U    utils/fppkg/Makefile.fpc
U    utils/h2pas/Makefile.fpc
U    utils/fpcreslipo/Makefile.fpc
U    ide/Makefile.fpc
U    utils/fpcres/Makefile.fpc
U    utils/Makefile.fpc
U    utils/fpmc/Makefile.fpc
U    utils/rmwait/Makefile.fpc
U    utils/importtl/Makefile.fpc
U    utils/pas2js/Makefile.fpc
U    utils/dxegen/Makefile.fpc
U    utils/debugsvr/Makefile.fpc
U    utils/fpcm/Makefile.fpmake.bs.template
U    utils/fpdoc/Makefile.fpc
U    utils/fprcp/Makefile.fpc
U    utils/unicode/Makefile.fpc
U    utils/pas2fpm/Makefile.fpc
U    utils/fpcm/Makefile.fpmake.template
U    utils/mksymbian/Makefile.fpc
U    utils/instantfpc/Makefile.fpc
U    utils/pas2ut/Makefile.fpc
U    utils/pas2jni/Makefile.fpc
--- Recording mergeinfo for merge of r31317 into '.':
 U   .
Summary of conflicts:
  Tree conflicts: 2
Resolved conflicted state of 'packages/googleapi'
Resolved conflicted state of 'packages/libenet'
Summary of conflicts:
  Tree conflicts: 0 remaining (and 2 already resolved)

# revisions: 31317

git-svn-id: branches/fixes_3_0@31969 -
 2015-10-06 21:20:59 +00:00
joost
d9d7b875c0 --- Merging r31316 into '.': 
U    utils/fpmake.pp
--- Recording mergeinfo for merge of r31316 into '.':
 U   .

# revisions: 31316

git-svn-id: branches/fixes_3_0@31968 -
 2015-10-06 21:14:37 +00:00
joost
fdab74d165 --- Merging r31941 into '.': 
U    rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r31941 into '.':
 U   .

# revisions: 31941

git-svn-id: branches/fixes_3_0@31967 -
 2015-10-06 20:33:14 +00:00
joost
cb069711eb --- Merging r31953 into '.': 
U    packages/paszlib/src/infcodes.pas
--- Recording mergeinfo for merge of r31953 into '.':
 U   .

# revisions: 31953

git-svn-id: branches/fixes_3_0@31966 -
 2015-10-06 20:28:56 +00:00
joost
14606bfb7a --- Recording mergeinfo for merge of r31962 into '.': 
U   .
--- Recording mergeinfo for merge of r31963 into '.':
 G   .
--- Recording mergeinfo for merge of r31964 into '.':
 G   .

Mergeinfo for revisions 31962, 31963, 31964

git-svn-id: branches/fixes_3_0@31965 -
 2015-10-06 16:43:10 +00:00
joost
a608ba6fc6 --- Merging (from foreign repository) r31878 into '.': 
U    compiler/widestr.pas
--- Merging (from foreign repository) r31881 into '.':
G    compiler/widestr.pas
U    compiler/cresstr.pas
U    utils/rstconv.pp

# revisions: 31878, 31881

git-svn-id: branches/fixes_3_0@31964 -
 2015-10-06 15:38:10 +00:00