--- Merging r14118 into '.':
C utils/fpcm/fpcmake.inc
Summary of conflicts:
Text conflicts: 1

# revisions: 14118
------------------------------------------------------------------------
r14118 | marco | 2009-11-08 19:41:46 +0100 (Sun, 08 Nov 2009) | 2 lines
Changed paths:
M /trunk/utils/fpcm/fpcmake.inc

* haiku treated as general Unix in makefiles.

------------------------------------------------------------------------

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