   
   ## Compiler switch to embed a library name
 *** misc/icu/source/data/Makefile.in	Sat Aug 12 00:22:24 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/data/Makefile.in	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/data/Makefile.in	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 344,350 ****
   ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES)

      FixupData *fFixupData;
      le_int32   fFixupCount;
*** misc/icu/source/stubdata/Makefile.in	Fri Dec  2 11:21:34 2005
<<<<<<< icu-3.6.patch
--- misc/build/icu/source/stubdata/Makefile.in	Tue Nov 13 13:03:52 2007
=======
--- misc/build/icu/source/stubdata/Makefile.in	Mon Jan 28 21:31:51 2008
>>>>>>> 1.10.12.2
***************
*** 25,30 ****
--- 25,36 ----

  //
  // IndicClassTable addresses
*** misc/icu/source/layout/IndicReordering.cpp	Tue Apr 25 21:08:12 2006
--- misc/build/icu/source/layout/IndicReordering.cpp	Mon Jan 28 21:31:51 2008
***************
*** 50,55 ****
--- 50,63 ----
