--- Merging r14382 into '.':
C utils/fpcres/Makefile
C utils/fpcm/Makefile
C utils/fpmc/Makefile
C utils/tply/Makefile
C utils/Makefile
C utils/fpdoc/Makefile
C utils/fpcreslipo/Makefile
C utils/fppkg/Makefile
C utils/dxegen/Makefile
C utils/fprcp/Makefile
C utils/h2pas/Makefile
--- Merging r14383 into '.':
C ide/Makefile
C ide/compiler/Makefile
--- Merging r14384 into '.':
C tests/utils/Makefile
C tests/Makefile
--- Merging r14386 into '.':
C installer/Makefile
Summary of conflicts:
Text conflicts: 16

# revisions: 14382,14383,14384,14386
------------------------------------------------------------------------
r14382 | pierre | 2009-12-10 09:26:29 +0100 (Thu, 10 Dec 2009) | 1 line
Changed paths:
M /trunk/utils/Makefile
M /trunk/utils/dxegen/Makefile
M /trunk/utils/fpcm/Makefile
M /trunk/utils/fpcres/Makefile
M /trunk/utils/fpcreslipo/Makefile
M /trunk/utils/fpdoc/Makefile
M /trunk/utils/fpmc/Makefile
M /trunk/utils/fppkg/Makefile
M /trunk/utils/fprcp/Makefile
M /trunk/utils/h2pas/Makefile
M /trunk/utils/tply/Makefile

* Update Makefiles
------------------------------------------------------------------------
------------------------------------------------------------------------
r14383 | pierre | 2009-12-10 09:27:13 +0100 (Thu, 10 Dec 2009) | 1 line
Changed paths:
M /trunk/ide/Makefile
M /trunk/ide/compiler/Makefile

* Update Makefiles
------------------------------------------------------------------------
------------------------------------------------------------------------
r14384 | pierre | 2009-12-10 09:29:05 +0100 (Thu, 10 Dec 2009) | 1 line
Changed paths:
M /trunk/tests/Makefile
M /trunk/tests/utils/Makefile

* Update Makefiles
------------------------------------------------------------------------
------------------------------------------------------------------------
r14386 | pierre | 2009-12-10 12:25:32 +0100 (Thu, 10 Dec 2009) | 1 line
Changed paths:
M /trunk/installer/Makefile

* update Makefile
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@16676 -