   /*===========================================================================*/
   /* Code alignment and C function inlining                                    */
 *** misc/icu/source/common/unicode/rbbi.h	Fri Aug 11 07:46:40 2006
-<<<<<<< icu-3.6.patch
---- misc/build/icu/source/common/unicode/rbbi.h	Tue Nov 13 13:03:51 2007
-=======
 --- misc/build/icu/source/common/unicode/rbbi.h	Mon Jan 28 21:31:50 2008
->>>>>>> 1.10.12.2
 ***************
 *** 611,622 ****
 --- 611,624 ----

  }
  
*** misc/icu/source/common/unicode/ustring.h	Tue Aug 29 23:52:50 2006
<<<<<<< icu-3.6.patch
--- misc/build/icu/source/common/unicode/ustring.h	Tue Nov 13 13:03:51 2007
=======
--- misc/build/icu/source/common/unicode/ustring.h	Mon Jan 28 21:31:50 2008
>>>>>>> 1.10.12.2
***************
*** 918,924 ****
   * </pre>

  CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M#
  
*** misc/icu/source/config/mh-solaris	Fri Feb 24 20:31:14 2006
--- misc/build/icu/source/config/mh-solaris	Mon Jan 28 21:31:51 2008
***************
*** 18,34 ****
  
