   #else
       typedef uint16_t UChar;
 *** misc/icu/source/common/unicode/unistr.h	Tue Aug 29 23:52:50 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/common/unicode/unistr.h	Tue Nov 13 13:03:51 2007
-=======
 --- misc/build/icu/source/common/unicode/unistr.h	Mon Jan 28 21:31:50 2008
->>>>>>> 1.10.12.2
 ***************
 *** 3280,3286 ****
   //========================================

  #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 ----

  #include "unicode/unistr.h"
  #include "unicode/uchar.h"
*** misc/icu/source/tools/icupkg/icupkg.cpp	Fri Jul 21 23:17:52 2006
--- misc/build/icu/source/tools/icupkg/icupkg.cpp	Mon Jan 28 21:31:51 2008
***************
*** 332,337 ****
--- 332,341 ----
