       if (buffer != stackBuffer) {
           DELETE_ARRAY(buffer);
 *** misc/icu/source/layout/CoverageTables.cpp	Sat May  8 01:28:42 2004
+<<<<<<< icu-3.6.patch
 --- misc/build/icu/source/layout/CoverageTables.cpp	Tue Nov 13 13:03:52 2007
+=======
+--- misc/build/icu/source/layout/CoverageTables.cpp	Mon Jan 28 21:31:51 2008
+>>>>>>> 1.10.12.2
 ***************
 *** 44,49 ****
 --- 44,53 ----

  ## Compiler switch to embed a runtime search path
  LD_RPATH=
*** misc/icu/source/config/mh-irix	Thu Mar 23 19:51:52 2006
--- misc/build/icu/source/config/mh-irix	Tue Nov 13 13:03:52 2007
***************
*** 23,28 ****
--- 23,31 ----

  /*===========================================================================*/
  /* 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 ----
