   ifneq ($(ENABLE_STATIC),)
   TARGET = $(STUBDATA_LIBDIR)$(LIBSICU)$(TARGET_STUBNAME)$(ICULIBSUFFIX).$(A)
 *** misc/icu/source/test/intltest/loctest.cpp	Thu Jul  6 03:50:04 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/test/intltest/loctest.cpp	Tue Nov 13 13:03:52 2007
-=======
 --- misc/build/icu/source/test/intltest/loctest.cpp	Mon Jan 28 21:31:51 2008
->>>>>>> 1.10.12.2
 ***************
 *** 4,9 ****
 --- 4,10 ----

  #include "cmemory.h" // UAlignedMemory
  #include <string.h>
*** misc/icu/source/test/intltest/ustrtest.cpp	Tue Dec 28 22:13:54 2004
<<<<<<< icu-3.6.patch
--- misc/build/icu/source/test/intltest/ustrtest.cpp	Tue Nov 13 13:03:52 2007
=======
--- misc/build/icu/source/test/intltest/ustrtest.cpp	Mon Jan 28 21:31:51 2008
>>>>>>> 1.10.12.2
***************
*** 4,9 ****
--- 4,10 ----

  #else
      typedef uint16_t UChar;
*** misc/icu/source/common/unicode/unistr.h	Tue Aug 29 23:52:50 2006
--- misc/build/icu/source/common/unicode/unistr.h	Mon Jan 28 21:31:50 2008
***************
*** 3280,3286 ****
  //========================================
