   #endif
   
 *** misc/icu/source/common/unicode/pwin32.h	Tue Aug 29 23:34:38 2006
+<<<<<<< icu-3.6.patch
 --- misc/build/icu/source/common/unicode/pwin32.h	Tue Nov 13 13:03:51 2007
+=======
+--- misc/build/icu/source/common/unicode/pwin32.h	Mon Jan 28 21:31:50 2008
+>>>>>>> 1.10.12.2
 ***************
 *** 266,273 ****
 --- 266,278 ----

  #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	Tue Nov 13 13:03:52 2007
***************
*** 332,337 ****
--- 332,341 ----

      le_uint16 probe = power;
      le_uint16 index = 0;
*** misc/icu/source/layout/DeviceTables.cpp	Fri Jan 14 18:25:12 2005
<<<<<<< icu-3.6.patch
--- misc/build/icu/source/layout/DeviceTables.cpp	Tue Nov 13 13:03:52 2007
=======
--- misc/build/icu/source/layout/DeviceTables.cpp	Mon Jan 28 21:31:51 2008
>>>>>>> 1.10.12.2
***************
*** 22,28 ****
      le_uint16 format = SWAPW(deltaFormat) - 1;
