From 77dd0728f3aafa0b4b0b68c6dc6d7fffa7e64514 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 17 Apr 2007 07:54:47 +0000
Subject: INTEGRATION: CWS vq36 (1.12.2); FILE MERGED 2007/03/29 18:40:14 vq
 1.12.2.3: #i75765# Regenerate/reapply the changes to the moz patch.
 2007/03/29 18:16:27 vq 1.12.2.2: RESYNC: (1.12-1.13); FILE MERGED Revert to
 patchfile from milestone. The patchfile will be regenerated and committed
 separately. 2007/03/27 03:31:07 vq 1.12.2.1: #i75765# Work around gmake's new
 function macro "abspath".

---
 moz/mozilla-source-1.7.5.patch | 584 ++++++++++++++++++++++++-----------------
 1 file changed, 348 insertions(+), 236 deletions(-)

(limited to 'moz')

diff --git a/moz/mozilla-source-1.7.5.patch b/moz/mozilla-source-1.7.5.patch
index 6b007d7d20cb..c62367b86e3c 100644
--- a/moz/mozilla-source-1.7.5.patch
+++ b/moz/mozilla-source-1.7.5.patch
@@ -1,5 +1,5 @@
-*** misc/mozilla/build/autoconf/mozconfig-find	Fri Jul 16 20:13:24 2004
---- misc/build/mozilla/build/autoconf/mozconfig-find	Tue Mar 20 14:56:37 2007
+*** misc/mozilla/build/autoconf/mozconfig-find	Fri Jul 16 14:13:24 2004
+--- misc/build/mozilla/build/autoconf/mozconfig-find	Thu Mar 29 14:27:08 2007
 ***************
 *** 51,60 ****
                  $topsrcdir/.mozconfig \
@@ -20,8 +20,8 @@
   do
     if test -f $_config; then
       echo $_config;
-*** misc/mozilla/build/cygwin-wrapper	Thu Oct 30 22:05:56 2003
---- misc/build/mozilla/build/cygwin-wrapper	Tue Mar 20 14:56:37 2007
+*** misc/mozilla/build/cygwin-wrapper	Thu Oct 30 17:05:56 2003
+--- misc/build/mozilla/build/cygwin-wrapper	Thu Mar 29 14:27:08 2007
 ***************
 *** 1,4 ****
 ! #!/bin/sh
@@ -84,8 +84,8 @@
                       fi
                   fi
               fi
-*** misc/mozilla/calendar/Makefile.in	Sat Apr 10 16:27:46 2004
---- misc/build/mozilla/calendar/Makefile.in	Tue Mar 20 14:56:37 2007
+*** misc/mozilla/calendar/Makefile.in	Sat Apr 10 10:27:46 2004
+--- misc/build/mozilla/calendar/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 106,112 ****
   	mkdir -p ./xpi/bin/chrome
@@ -103,8 +103,8 @@
   	cp libxpical/_xpidlgen/calendar.xpt ./xpi/bin/components
   	cp $(srcdir)/resources/content/calendarService.js ./xpi/bin/components
   	cp -r $(srcdir)/resources/locale ./xpi/resources
-*** misc/mozilla/calendar/sunbird/Makefile.in	Wed Apr  7 21:18:59 2004
---- misc/build/mozilla/calendar/sunbird/Makefile.in	Tue Mar 20 14:56:38 2007
+*** misc/mozilla/calendar/sunbird/Makefile.in	Wed Apr  7 15:18:59 2004
+--- misc/build/mozilla/calendar/sunbird/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 71,87 ****
   sunbird::sunbirddirs sunbirdunix
@@ -184,8 +184,8 @@
   	cp $(topsrcdir)/dist/bin/components/docshell*.xpt ./MozillaSunbird/components
   
   sunbirdunix::
-*** misc/mozilla/config/Makefile.in	Mon Nov  1 19:30:40 2004
---- misc/build/mozilla/config/Makefile.in	Tue Mar 20 14:56:38 2007
+*** misc/mozilla/config/Makefile.in	Mon Nov  1 14:30:40 2004
+--- misc/build/mozilla/config/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 135,141 ****
   
@@ -203,8 +203,8 @@
   endif
   
   build_number: FORCE
-*** misc/mozilla/config/config.mk	Tue Oct 12 06:13:31 2004
---- misc/build/mozilla/config/config.mk	Tue Mar 20 14:56:38 2007
+*** misc/mozilla/config/config.mk	Tue Oct 12 00:13:31 2004
+--- misc/build/mozilla/config/config.mk	Thu Mar 29 14:27:08 2007
 ***************
 *** 771,776 ****
 --- 771,793 ----
@@ -231,8 +231,8 @@
   # Include any personal overrides the user might think are needed.
   #
   -include $(MY_CONFIG)
-*** misc/mozilla/config/rules.mk	Thu Jun 24 20:58:48 2004
---- misc/build/mozilla/config/rules.mk	Tue Mar 20 14:56:38 2007
+*** misc/mozilla/config/rules.mk	Thu Jun 24 14:58:48 2004
+--- misc/build/mozilla/config/rules.mk	Thu Mar 29 14:27:08 2007
 ***************
 *** 516,523 ****
   ifeq ($(OS_ARCH),WINNT)
@@ -263,8 +263,8 @@
   	$(ELOG) $(XPIDL_COMPILE) -m header -w -I$(srcdir) -I$(IDL_DIR) -o $(XPIDL_GEN_DIR)/$* $(_VPATH_SRCS)
   	@if test -n "$(findstring $*.h, $(EXPORTS) $(SDK_HEADERS))"; \
   	  then echo "*** WARNING: file $*.h generated from $*.idl overrides $(srcdir)/$*.h"; else true; fi
-*** misc/mozilla/configure	Tue Oct 12 06:13:29 2004
---- misc/build/mozilla/configure	Tue Mar 20 14:56:39 2007
+*** misc/mozilla/configure	Tue Oct 12 00:13:29 2004
+--- misc/build/mozilla/configure	Thu Mar 29 14:27:08 2007
 ***************
 *** 5895,5901 ****
          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
@@ -297,8 +297,8 @@
       CC="\$(CYGWIN_WRAPPER) $CC"
       CXX="\$(CYGWIN_WRAPPER) $CXX"
       CPP="\$(CYGWIN_WRAPPER) $CPP"
-*** misc/mozilla/configure.in	Tue Oct 12 06:13:29 2004
---- misc/build/mozilla/configure.in	Tue Mar 20 14:56:40 2007
+*** misc/mozilla/configure.in	Tue Oct 12 00:13:29 2004
+--- misc/build/mozilla/configure.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 1536,1542 ****
          MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
@@ -331,8 +331,8 @@
       CC="\$(CYGWIN_WRAPPER) $CC"
       CXX="\$(CYGWIN_WRAPPER) $CXX"
       CPP="\$(CYGWIN_WRAPPER) $CPP"
-*** misc/mozilla/directory/c-sdk/build.mk	Tue Sep 14 23:14:38 2004
---- misc/build/mozilla/directory/c-sdk/build.mk	Tue Mar 20 14:56:40 2007
+*** misc/mozilla/directory/c-sdk/build.mk	Tue Sep 14 17:14:38 2004
+--- misc/build/mozilla/directory/c-sdk/build.mk	Thu Mar 29 14:27:08 2007
 ***************
 *** 367,373 ****
   ifdef NS_USE_GCC
@@ -350,8 +350,8 @@
   else
   DEBUG_LINK_OPT=/DEBUG
   ifeq ($(BUILD_OPT), 1)
-*** misc/mozilla/directory/c-sdk/config/Makefile	Wed Feb 11 05:01:16 2004
---- misc/build/mozilla/directory/c-sdk/config/Makefile	Tue Mar 20 14:56:41 2007
+*** misc/mozilla/directory/c-sdk/config/Makefile	Tue Feb 10 23:01:16 2004
+--- misc/build/mozilla/directory/c-sdk/config/Makefile	Thu Mar 29 14:27:08 2007
 ***************
 *** 48,58 ****
   
@@ -403,19 +403,20 @@
   
   ifeq ($(MOZ_OS2_TOOLS),VACPP)
 ***************
-*** 114,120 ****
---- 118,126 ----
+*** 114,121 ****
+--- 118,127 ----
   
   OUTOPTION = -o # end of the line
   ifeq (,$(filter-out WINNT OS2,$(OS_ARCH)))
 + ifndef NS_USE_GCC
   OUTOPTION = /Fe
-+ endif
   endif
++ endif
   
   # Redefine MAKE_OBJDIR for just this directory
-*** misc/mozilla/directory/c-sdk/config/autoconf.mk.in	Fri Mar  7 21:57:13 2003
---- misc/build/mozilla/directory/c-sdk/config/autoconf.mk.in	Tue Mar 20 14:56:41 2007
+  define MAKE_OBJDIR
+*** misc/mozilla/directory/c-sdk/config/autoconf.mk.in	Fri Mar  7 15:57:13 2003
+--- misc/build/mozilla/directory/c-sdk/config/autoconf.mk.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 25,30 ****
 --- 25,31 ----
@@ -426,8 +427,8 @@
   ASM_SUFFIX	= @ASM_SUFFIX@
   PROG_SUFFIX	= @PROG_SUFFIX@
   MOD_NAME	= @NSPR_MODNAME@
-*** misc/mozilla/directory/c-sdk/config/cygwin-wrapper	Thu Apr  3 01:22:39 2003
---- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper	Tue Mar 20 14:56:41 2007
+*** misc/mozilla/directory/c-sdk/config/cygwin-wrapper	Wed Apr  2 19:22:39 2003
+--- misc/build/mozilla/directory/c-sdk/config/cygwin-wrapper	Thu Mar 29 14:27:08 2007
 ***************
 *** 1,4 ****
 ! #!/bin/sh
@@ -488,8 +489,8 @@
 !    done
   fi
   exec $prog $args
-*** misc/mozilla/directory/c-sdk/configure	Tue Sep 14 23:14:38 2004
---- misc/build/mozilla/directory/c-sdk/configure	Tue Mar 20 14:56:41 2007
+*** misc/mozilla/directory/c-sdk/configure	Tue Sep 14 17:14:38 2004
+--- misc/build/mozilla/directory/c-sdk/configure	Thu Mar 29 14:27:08 2007
 ***************
 *** 2830,2835 ****
 --- 2830,2836 ----
@@ -568,8 +569,8 @@
   s%@ASM_SUFFIX@%$ASM_SUFFIX%g
   s%@PROG_SUFFIX@%$PROG_SUFFIX%g
   s%@MKSHLIB@%$MKSHLIB%g
-*** misc/mozilla/directory/c-sdk/configure.in	Tue Sep 14 23:14:38 2004
---- misc/build/mozilla/directory/c-sdk/configure.in	Tue Mar 20 14:56:41 2007
+*** misc/mozilla/directory/c-sdk/configure.in	Tue Sep 14 17:14:38 2004
+--- misc/build/mozilla/directory/c-sdk/configure.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 511,516 ****
 --- 511,517 ----
@@ -631,8 +632,8 @@
   AC_SUBST(ASM_SUFFIX)
   AC_SUBST(PROG_SUFFIX)
   AC_SUBST(MKSHLIB)
-*** misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	Wed Mar 10 19:47:25 2004
---- misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	Tue Mar 20 14:56:41 2007
+*** misc/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	Wed Mar 10 13:47:25 2004
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 93,99 ****
   HDIR		= $(topsrcdir)/ldap/include
@@ -650,8 +651,8 @@
   
   INSTALLDIR	= $(DIST)/$(OBJDIR_NAME)
   
-*** misc/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in	Wed Mar 10 19:47:26 2004
---- misc/build/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in	Tue Mar 20 14:56:42 2007
+*** misc/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in	Wed Mar 10 13:47:26 2004
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 46,52 ****
   LIBPRLDAP =
@@ -669,8 +670,8 @@
   
   INSTALLDIR      = $(DIST)/$(OBJDIR_NAME)
   
-*** misc/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile	Wed Feb 11 05:01:15 2004
---- misc/build/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile	Tue Mar 20 14:56:42 2007
+*** misc/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile	Tue Feb 10 23:01:15 2004
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile	Thu Mar 29 14:27:08 2007
 ***************
 *** 41,47 ****
   HDIR		= $(topsrcdir)/ldap/include
@@ -707,17 +708,17 @@
               comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
               rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib
 ***************
-*** 105,110 ****
---- 114,120 ----
-  EXTRA_LIBS += $(dist_libdir)/$(SOFTOKN_LIBNAME).lib
+*** 106,111 ****
+--- 115,121 ----
   endif
   EXTRA_LIBS += $(dist_libdir)/$(SSL_LIBNAME).lib
-+ endif
   endif
++ endif
   
   ifeq ($(OS_ARCH),OS2)
-*** misc/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in	Fri Mar  7 21:57:17 2003
---- misc/build/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in	Tue Mar 20 14:56:42 2007
+  EXTRA_LIBS = $(OS_LIBS)
+*** misc/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in	Fri Mar  7 15:57:17 2003
+--- misc/build/mozilla/directory/c-sdk/ldap/libraries/libssldap/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 40,46 ****
   HDIR		= $(topsrcdir)/ldap/include
@@ -735,8 +736,8 @@
   
   INSTALLDIR      = $(DIST)/$(OBJDIR_NAME)
   
-*** misc/mozilla/embedding/browser/gtk/src/Makefile.in	Thu Apr  8 21:18:25 2004
---- misc/build/mozilla/embedding/browser/gtk/src/Makefile.in	Tue Mar 20 14:56:42 2007
+*** misc/mozilla/embedding/browser/gtk/src/Makefile.in	Thu Apr  8 15:18:25 2004
+--- misc/build/mozilla/embedding/browser/gtk/src/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 111,117 ****
   		gtkmozembed_internal.h
@@ -771,10 +772,10 @@
   		$(MOZ_COMPONENT_LIBS) \
   		$(NULL)
   endif
-*** misc/mozilla/embedding/browser/gtk/tests/Makefile.in	Tue Oct  7 04:43:00 2003
---- misc/build/mozilla/embedding/browser/gtk/tests/Makefile.in	Tue Mar 20 14:56:42 2007
+*** misc/mozilla/embedding/browser/gtk/tests/Makefile.in	Mon Oct  6 22:43:00 2003
+--- misc/build/mozilla/embedding/browser/gtk/tests/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
-*** 46,54 ****
+*** 46,55 ****
   		TestGtkEmbedNotebook.cpp \
   		TestGtkEmbedSocket.cpp \
   		TestGtkEmbedChild.cpp
@@ -784,19 +785,21 @@
   
   # ENABLE_GNOME=1
   
---- 46,55 ----
+  ifdef ENABLE_GNOME
+--- 46,56 ----
   		TestGtkEmbedNotebook.cpp \
   		TestGtkEmbedSocket.cpp \
   		TestGtkEmbedChild.cpp
   
   SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=)
-+ 
-+ endif
   
++ endif
++ 
   # ENABLE_GNOME=1
   
-*** misc/mozilla/embedding/config/Makefile.in	Mon Jul  7 10:02:25 2003
---- misc/build/mozilla/embedding/config/Makefile.in	Tue Mar 20 14:56:42 2007
+  ifdef ENABLE_GNOME
+*** misc/mozilla/embedding/config/Makefile.in	Mon Jul  7 04:02:25 2003
+--- misc/build/mozilla/embedding/config/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 85,91 ****
   	$(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/Embed/chrome
@@ -814,8 +817,8 @@
   endif
   ifeq ($(OS_ARCH),WINNT)
   ifeq ($(WINAPP),mfcembed)
-*** misc/mozilla/extensions/p3p/Makefile.in	Thu Dec  4 19:20:16 2003
---- misc/build/mozilla/extensions/p3p/Makefile.in	Tue Mar 20 14:56:42 2007
+*** misc/mozilla/extensions/p3p/Makefile.in	Thu Dec  4 13:20:16 2003
+--- misc/build/mozilla/extensions/p3p/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 62,84 ****
   p3p200010.xsl: resources/content/p3p.xsl.in Makefile.in
@@ -865,8 +868,8 @@
   	$(PP) -DNAMESPACE=http://www.w3.org/2002/01/P3Pv1 \
 ! 	-DHAS_CALL_OURS -DHAS_PURPOSE_SRC \
   	$< > $@
-*** misc/mozilla/extensions/pref/autoconfig/src/Makefile.in	Wed Jan  7 14:36:25 2004
---- misc/build/mozilla/extensions/pref/autoconfig/src/Makefile.in	Tue Mar 20 14:56:43 2007
+*** misc/mozilla/extensions/pref/autoconfig/src/Makefile.in	Wed Jan  7 08:36:25 2004
+--- misc/build/mozilla/extensions/pref/autoconfig/src/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 68,74 ****
   endif
@@ -884,8 +887,8 @@
                      $(LIBS_DIR) \
                      $(MOZ_JS_LIBS) \
                      $(MOZ_COMPONENT_LIBS) \
-*** misc/mozilla/extensions/sql/build/Makefile.in	Sun Feb  8 22:51:04 2004
---- misc/build/mozilla/extensions/sql/build/Makefile.in	Tue Mar 20 14:56:43 2007
+*** misc/mozilla/extensions/sql/build/Makefile.in	Sun Feb  8 16:51:04 2004
+--- misc/build/mozilla/extensions/sql/build/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 52,56 ****
   	cd $(DIST); zip -r $(XPI_FILE) \
@@ -899,8 +902,8 @@
   	bin/components/sqlpgsql.xpt \
 ! 	bin/components/$(DLL_PREFIX)sql$(DLL_SUFFIX) \
   	bin/chrome/sql.jar
-*** misc/mozilla/gfx/idl/nsIFreeType2.idl	Fri Apr 16 03:09:33 2004
---- misc/build/mozilla/gfx/idl/nsIFreeType2.idl	Tue Mar 20 14:56:43 2007
+*** misc/mozilla/gfx/idl/nsIFreeType2.idl	Thu Apr 15 21:09:33 2004
+--- misc/build/mozilla/gfx/idl/nsIFreeType2.idl	Thu Mar 29 14:27:08 2007
 ***************
 *** 76,85 ****
   native FT_Sfnt_Tag(FT_Sfnt_Tag);
@@ -977,8 +980,8 @@
   /* #ifdef MOZ_SVG */
       void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix,
                           in FT_Vector_p delta);
-*** misc/mozilla/gfx/src/freetype/nsFreeType.cpp	Sat Feb  7 16:22:30 2004
---- misc/build/mozilla/gfx/src/freetype/nsFreeType.cpp	Tue Mar 20 14:56:43 2007
+*** misc/mozilla/gfx/src/freetype/nsFreeType.cpp	Sat Feb  7 10:22:30 2004
+--- misc/build/mozilla/gfx/src/freetype/nsFreeType.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 111,117 ****
     {"FT_Outline_Decompose",    NS_FT2_OFFSET(nsFT_Outline_Decompose),    PR_TRUE},
@@ -1072,8 +1075,8 @@
   {
     *aCache = mImageCache;
     return NS_OK;
-*** misc/mozilla/gfx/src/freetype/nsFreeType.h	Fri Apr 16 23:31:42 2004
---- misc/build/mozilla/gfx/src/freetype/nsFreeType.h	Tue Mar 20 14:56:44 2007
+*** misc/mozilla/gfx/src/freetype/nsFreeType.h	Fri Apr 16 17:31:42 2004
+--- misc/build/mozilla/gfx/src/freetype/nsFreeType.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 104,116 ****
   typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
@@ -1137,8 +1140,8 @@
   
     static nsHashtable   *sFontFamilies;
     static nsHashtable   *sRange1CharSetNames;
-*** misc/mozilla/gfx/src/gtk/Makefile.in	Mon Nov 10 13:24:51 2003
---- misc/build/mozilla/gfx/src/gtk/Makefile.in	Tue Mar 20 14:56:44 2007
+*** misc/mozilla/gfx/src/gtk/Makefile.in	Mon Nov 10 07:24:51 2003
+--- misc/build/mozilla/gfx/src/gtk/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 176,181 ****
 --- 176,185 ----
@@ -1152,8 +1155,8 @@
   ifeq ($(OS_ARCH), SunOS)
   ifndef GNU_CC
   # When using Sun's WorkShop compiler, including
-*** misc/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	Thu Feb  5 02:57:05 2004
---- misc/build/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	Tue Mar 20 14:56:44 2007
+*** misc/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	Wed Feb  4 20:57:05 2004
+--- misc/build/mozilla/gfx/src/ps/nsFontMetricsPS.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 1141,1150 ****
     
@@ -1248,8 +1251,8 @@
     if (NS_FAILED(rv))
       return;
    
-*** misc/mozilla/gfx/src/ps/nsFontMetricsPS.h	Tue Apr 22 18:25:09 2003
---- misc/build/mozilla/gfx/src/ps/nsFontMetricsPS.h	Tue Mar 20 14:56:44 2007
+*** misc/mozilla/gfx/src/ps/nsFontMetricsPS.h	Tue Apr 22 12:25:09 2003
+--- misc/build/mozilla/gfx/src/ps/nsFontMetricsPS.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 320,326 ****
     nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
@@ -1284,8 +1287,8 @@
   };
   #endif
   
-*** misc/mozilla/gfx/src/windows/nsDeviceContextWin.cpp	Tue Jun  8 00:17:11 2004
---- misc/build/mozilla/gfx/src/windows/nsDeviceContextWin.cpp	Tue Mar 20 14:56:44 2007
+*** misc/mozilla/gfx/src/windows/nsDeviceContextWin.cpp	Mon Jun  7 18:17:11 2004
+--- misc/build/mozilla/gfx/src/windows/nsDeviceContextWin.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 378,384 ****
 --- 378,388 ----
@@ -1328,8 +1331,8 @@
                         acp, acplen, NULL, NULL);
         if ( outlen > 0)
            acp[outlen] = '\0';  // null terminate
-*** misc/mozilla/gfx/src/windows/nsFontMetricsWin.cpp	Sat Oct 16 06:14:42 2004
---- misc/build/mozilla/gfx/src/windows/nsFontMetricsWin.cpp	Tue Mar 20 14:56:44 2007
+*** misc/mozilla/gfx/src/windows/nsFontMetricsWin.cpp	Sat Oct 16 00:14:42 2004
+--- misc/build/mozilla/gfx/src/windows/nsFontMetricsWin.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 1259,1265 ****
 --- 1259,1269 ----
@@ -1505,8 +1508,8 @@
                                          buf, nb, nsnull, nsnull);
   }
   
-*** misc/mozilla/gfx/src/windows/nsRenderingContextWin.cpp	Thu Feb  5 02:57:06 2004
---- misc/build/mozilla/gfx/src/windows/nsRenderingContextWin.cpp	Tue Mar 20 14:56:45 2007
+*** misc/mozilla/gfx/src/windows/nsRenderingContextWin.cpp	Wed Feb  4 20:57:06 2004
+--- misc/build/mozilla/gfx/src/windows/nsRenderingContextWin.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 2939,2955 ****
 --- 2939,2967 ----
@@ -1553,8 +1556,8 @@
             && (inStr[0] == outStr[1]) ) {
           gBidiInfo = GCP_REORDER;
   #ifdef NS_DEBUG
-*** misc/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	Thu Dec 25 09:24:52 2003
---- misc/build/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	Tue Mar 20 14:56:45 2007
+*** misc/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	Thu Dec 25 03:24:52 2003
+--- misc/build/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 177,183 ****
     FTC_Manager mgr;
@@ -1673,8 +1676,8 @@
     mFt2->GetImageCache(&icache);
     if (!icache)
       return 0;
-*** misc/mozilla/gfx/src/x11shared/nsFontFreeType.h	Tue Apr 22 18:25:13 2003
---- misc/build/mozilla/gfx/src/x11shared/nsFontFreeType.h	Tue Mar 20 14:56:45 2007
+*** misc/mozilla/gfx/src/x11shared/nsFontFreeType.h	Tue Apr 22 12:25:13 2003
+--- misc/build/mozilla/gfx/src/x11shared/nsFontFreeType.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 110,116 ****
     XImage *GetXImage(PRUint32 width, PRUint32 height);
@@ -1692,8 +1695,8 @@
     nsCOMPtr<nsIFreeType2> mFt2;
   };
   
-*** misc/mozilla/jpeg/jmorecfg.h	Fri Mar 26 02:17:16 2004
---- misc/build/mozilla/jpeg/jmorecfg.h	Tue Mar 20 14:56:45 2007
+*** misc/mozilla/jpeg/jmorecfg.h	Thu Mar 25 21:17:16 2004
+--- misc/build/mozilla/jpeg/jmorecfg.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 108,115 ****
   /* Defines for MMX/SSE2 support. */
@@ -1713,8 +1716,8 @@
   #endif
   
   /* Compressed datastreams are represented as arrays of JOCTET.
-*** misc/mozilla/js/src/xpconnect/src/Makefile.in	Wed Jan  7 14:36:33 2004
---- misc/build/mozilla/js/src/xpconnect/src/Makefile.in	Tue Mar 20 14:56:45 2007
+*** misc/mozilla/js/src/xpconnect/src/Makefile.in	Wed Jan  7 08:36:33 2004
+--- misc/build/mozilla/js/src/xpconnect/src/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 148,151 ****
   .NOTPARALLEL::
@@ -1722,8 +1725,8 @@
   endif
 - 
 --- 148,150 ----
-*** misc/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Fri Mar 19 02:36:16 2004
---- misc/build/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Thu Mar 18 21:36:16 2004
+--- misc/build/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 440,458 ****
       return;
@@ -1765,8 +1768,8 @@
     NS_ASSERTION(mFace, "failed to get face/size");
   }
   
-*** misc/mozilla/mailnews/addrbook/src/Makefile.in	Mon Oct  6 19:48:56 2003
---- misc/build/mozilla/mailnews/addrbook/src/Makefile.in	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/Makefile.in	Mon Oct  6 13:48:56 2003
+--- misc/build/mozilla/mailnews/addrbook/src/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 86,91 ****
 --- 86,92 ----
@@ -1777,8 +1780,8 @@
   		$(NULL)
   
   EXPORTS		= \
-*** misc/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.cpp	Fri Oct 11 10:17:13 2002
---- misc/build/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.cpp	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.cpp	Fri Oct 11 04:17:13 2002
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 39,44 ****
 --- 39,45 ----
@@ -1918,8 +1921,8 @@
 +         }
 +     }
 + }
-*** misc/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.h	Fri Sep 28 22:06:21 2001
---- misc/build/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.h	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.h	Fri Sep 28 16:06:21 2001
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbBoolExprToLDAPFilter.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 42,47 ****
 --- 42,48 ----
@@ -1949,8 +1952,8 @@
   };
   
   #endif
-*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp	Sat Feb 14 03:09:27 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp	Fri Feb 13 21:09:27 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 118,128 ****
   
@@ -2064,8 +2067,8 @@
               + NS_LITERAL_CSTRING(".protocolVersion")).get(),
           getter_Copies(protocolVersion));
   
-*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp	Sat Feb 14 03:09:27 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp	Fri Feb 13 21:09:27 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 74,80 ****
           PRInt32 resultLimit = -1,
@@ -2168,8 +2171,8 @@
       messageListener = _messageListener;
       nsVoidKey key (NS_REINTERPRET_CAST(void *,contextID));
   
-*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h	Sat Feb 14 03:09:27 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h	Fri Feb 13 21:09:27 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 74,79 ****
 --- 74,80 ----
@@ -2180,8 +2183,8 @@
       nsCOMPtr<nsILDAPURL> mDirectoryUrl; // the URL for the server
       PRUint32 mProtocolVersion; // version of LDAP (see nsILDAPConnection.idl)
   
-*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.cpp	Sat Mar 22 16:43:29 2003
---- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.cpp	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.cpp	Sat Mar 22 11:43:29 2003
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 39,44 ****
 --- 39,45 ----
@@ -2386,13 +2389,11 @@
   
       return NS_REINTERPRET_CAST(const MozillaLdapPropertyRelation *, mLdapToMozilla.Get(&key)) ;
 ***************
-*** 287,291 ****
---- 296,361 ----
-          }
-      }
+*** 289,291 ****
+--- 298,361 ----
   
-+     return rv;
-+ }
+      return rv;
+  }
 + 
 + // Parse the input string which may contain a single ldap attribute or multiple attributes in the form
 + // "string" or "string1,string2,string3" respectively and assign to the array.
@@ -2452,10 +2453,10 @@
 +     }
 + 
 +     nsCRT::free(LDAPProperty);
-      return rv;
-  }
-*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.h	Tue Apr  9 11:27:24 2002
---- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.h	Tue Mar 20 14:56:46 2007
++     return rv;
++ }
+*** misc/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.h	Tue Apr  9 05:27:24 2002
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbLDAPProperties.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 85,90 ****
 --- 85,91 ----
@@ -2466,8 +2467,8 @@
   };
   
   #endif
-*** misc/mozilla/mailnews/addrbook/src/nsAbMD5sum.cpp	Tue Mar 20 16:01:29 2007
---- misc/build/mozilla/mailnews/addrbook/src/nsAbMD5sum.cpp	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbMD5sum.cpp	Thu Mar 29 14:34:48 2007
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbMD5sum.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 1 ****
 ! dummy
@@ -3105,8 +3106,8 @@
 ! 		return 1;
 ! 	return strcmp(newSum,sum);
 ! }
-*** misc/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp	Tue Nov 12 20:19:56 2002
---- misc/build/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp	Tue Nov 12 14:19:56 2002
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 266,273 ****
   	if (mCardDatabase)
@@ -3125,8 +3126,8 @@
   	}
   	else
   		return NS_ERROR_FAILURE;
-*** misc/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp	Tue Mar  9 15:42:24 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp	Tue Mar 20 14:56:46 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp	Tue Mar  9 09:42:24 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbMDBDirectory.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 537,543 ****
           }
@@ -3178,8 +3179,8 @@
   }
   
   NS_IMETHODIMP nsAbMDBDirectory::DropCard(nsIAbCard* aCard, PRBool needToCopyCard)
-*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookCard.cpp	Tue Mar  9 16:18:40 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookCard.cpp	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookCard.cpp	Tue Mar  9 10:18:40 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookCard.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 97,102 ****
 --- 97,103 ----
@@ -3334,8 +3335,8 @@
       }
       delete [] properties ;
       nsXPIDLString unichar ;
-*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp	Tue Feb 25 22:36:33 2003
---- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp	Tue Feb 25 16:36:33 2003
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 124,131 ****
       nsCAutoString uri ;
@@ -3355,8 +3356,8 @@
           buildAbWinUri(kOutlookDirectoryScheme, abType, uri) ;
           uri.Append(entryId) ;
           
-*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.cpp	Thu Feb  5 19:33:06 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.cpp	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.cpp	Thu Feb  5 13:33:06 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 126,132 ****
           PRINTF(("Cannot get type.\n")) ;
@@ -3849,8 +3850,8 @@
               nsMapiEntry parentEntry ;
               nsMapiEntry temporaryEntry ;
   
-*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.h	Thu Feb  5 19:33:06 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.h	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.h	Thu Feb  5 13:33:06 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbOutlookDirectory.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 46,51 ****
 --- 46,52 ----
@@ -3884,8 +3885,8 @@
   
       nsMapiEntry *mMapiData ;
       // Container for the query threads
-*** misc/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp	Wed Apr 14 22:16:12 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp	Wed Apr 14 16:16:12 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 41,46 ****
 --- 41,49 ----
@@ -4644,8 +4645,8 @@
   }
   
   const char *kOutlookDirectoryScheme = "moz-aboutlookdirectory://" ;
-*** misc/mozilla/mailnews/addrbook/src/nsAbWinHelper.h	Wed Apr 14 22:16:12 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.h	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAbWinHelper.h	Wed Apr 14 16:16:12 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAbWinHelper.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 45,50 ****
 --- 45,68 ----
@@ -4878,8 +4879,8 @@
   private:
       nsAbWinHelper *mHelper ;
   } ;
-*** misc/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp	Wed Dec 24 18:18:08 2003
---- misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp	Wed Dec 24 12:18:08 2003
+--- misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 97,102 ****
 --- 97,105 ----
@@ -4956,8 +4957,8 @@
       return err;
   }
   
-*** misc/mozilla/mailnews/addrbook/src/nsAddrDatabase.h	Wed Jan 28 18:22:13 2004
---- misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.h	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsAddrDatabase.h	Wed Jan 28 12:22:13 2004
+--- misc/build/mozilla/mailnews/addrbook/src/nsAddrDatabase.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 396,401 ****
 --- 396,402 ----
@@ -4968,8 +4969,8 @@
   	PRBool				m_mdbTokensInitialized;
       nsVoidArray /*<nsIAddrDBListener>*/ *m_ChangeListeners;
   
-*** misc/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp	Tue Oct 30 08:59:16 2001
---- misc/build/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp	Tue Oct 30 03:59:16 2001
+--- misc/build/mozilla/mailnews/addrbook/src/nsMapiAddressBook.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 41,46 ****
 --- 41,62 ----
@@ -6869,8 +6870,8 @@
 +     
 +     return lpMsgStore;
 + }
-*** misc/mozilla/mailnews/addrbook/src/nsMapiAddressBook.h	Fri Sep 28 22:06:25 2001
---- misc/build/mozilla/mailnews/addrbook/src/nsMapiAddressBook.h	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsMapiAddressBook.h	Fri Sep 28 16:06:25 2001
+--- misc/build/mozilla/mailnews/addrbook/src/nsMapiAddressBook.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 40,51 ****
 --- 40,81 ----
@@ -7015,8 +7016,8 @@
   } ;
   
   #endif // nsMapiAddressBook_h___
-*** misc/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp	Tue Oct 30 08:59:16 2001
---- misc/build/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp	Tue Mar 20 14:56:47 2007
+*** misc/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp	Tue Oct 30 03:59:16 2001
+--- misc/build/mozilla/mailnews/addrbook/src/nsWabAddressBook.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 47,52 ****
 --- 47,68 ----
@@ -7325,8 +7326,8 @@
       nsAutoLock guard(mMutex) ;
   
       if (!LoadWabLibrary()) {
-*** misc/mozilla/mailnews/addrbook/src/nsWabAddressBook.h	Fri Sep 28 22:06:25 2001
---- misc/build/mozilla/mailnews/addrbook/src/nsWabAddressBook.h	Tue Mar 20 14:56:48 2007
+*** misc/mozilla/mailnews/addrbook/src/nsWabAddressBook.h	Fri Sep 28 16:06:25 2001
+--- misc/build/mozilla/mailnews/addrbook/src/nsWabAddressBook.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 47,52 ****
 --- 47,61 ----
@@ -7409,8 +7410,8 @@
   
   private :
   } ;
-*** misc/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp	Mon Feb  9 23:48:47 2004
---- misc/build/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp	Tue Mar 20 14:56:48 2007
+*** misc/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp	Mon Feb  9 17:48:47 2004
+--- misc/build/mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 713,720 ****
 --- 713,725 ----
@@ -7473,8 +7474,8 @@
     }
   
     // do this last
-*** misc/mozilla/mailnews/mime/src/mimeeobj.h	Fri Sep 28 22:07:42 2001
---- misc/build/mozilla/mailnews/mime/src/mimeeobj.h	Tue Mar 20 15:36:42 2007
+*** misc/mozilla/mailnews/mime/src/mimeeobj.h	Fri Sep 28 16:07:42 2001
+--- misc/build/mozilla/mailnews/mime/src/mimeeobj.h	Thu Mar 29 14:27:08 2007
 ***************
 *** 54,60 ****
     MimeLeafClass leaf;
@@ -7492,8 +7493,8 @@
   
   struct MimeExternalObject {
     MimeLeaf leaf;
-*** misc/mozilla/modules/libpref/src/Makefile.in	Fri Jan 16 20:22:37 2004
---- misc/build/mozilla/modules/libpref/src/Makefile.in	Tue Mar 20 14:56:48 2007
+*** misc/mozilla/modules/libpref/src/Makefile.in	Fri Jan 16 14:22:37 2004
+--- misc/build/mozilla/modules/libpref/src/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 78,84 ****
   PREF_JS_EXPORTS	+= $(srcdir)/init/non-shared.txt
@@ -7518,8 +7519,8 @@
   			all.js mailnews.js editor.js \
   			aix.js beos.js unix.js winpref.js os2prefs.js openvms.js photon.js)
 + 
-*** misc/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	Thu Sep  2 01:45:24 2004
---- misc/build/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	Tue Mar 20 14:56:48 2007
+*** misc/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	Wed Sep  1 19:45:24 2004
+--- misc/build/mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	Thu Mar 29 14:27:08 2007
 ***************
 *** 834,841 ****
   void
@@ -7539,8 +7540,8 @@
   
       switch (name) {
       case MAX_CONNECTIONS:
-*** misc/mozilla/nsprpub/build/cygwin-wrapper	Thu Apr  3 01:22:38 2003
---- misc/build/mozilla/nsprpub/build/cygwin-wrapper	Tue Mar 20 14:56:49 2007
+*** misc/mozilla/nsprpub/build/cygwin-wrapper	Wed Apr  2 19:22:38 2003
+--- misc/build/mozilla/nsprpub/build/cygwin-wrapper	Thu Mar 29 14:27:08 2007
 ***************
 *** 1,4 ****
 ! #!/bin/sh
@@ -7601,8 +7602,8 @@
 !    done
   fi
   exec $prog $args
-*** misc/mozilla/nsprpub/config/autoconf.mk.in	Sat Mar 22 16:28:52 2003
---- misc/build/mozilla/nsprpub/config/autoconf.mk.in	Tue Mar 20 14:56:49 2007
+*** misc/mozilla/nsprpub/config/autoconf.mk.in	Sat Mar 22 11:28:52 2003
+--- misc/build/mozilla/nsprpub/config/autoconf.mk.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 22,27 ****
 --- 22,28 ----
@@ -7613,8 +7614,8 @@
   OBJ_SUFFIX	= @OBJ_SUFFIX@
   LIB_SUFFIX	= @LIB_SUFFIX@
   DLL_SUFFIX	= @DLL_SUFFIX@
-*** misc/mozilla/nsprpub/config/rules.mk	Tue Sep 16 04:00:28 2003
---- misc/build/mozilla/nsprpub/config/rules.mk	Tue Mar 20 14:56:49 2007
+*** misc/mozilla/nsprpub/config/rules.mk	Mon Sep 15 22:00:28 2003
+--- misc/build/mozilla/nsprpub/config/rules.mk	Thu Mar 29 14:27:08 2007
 ***************
 *** 101,119 ****
   ifdef LIBRARY_NAME
@@ -7646,8 +7647,8 @@
   
   else
   
-*** misc/mozilla/nsprpub/configure	Tue Sep 14 23:14:38 2004
---- misc/build/mozilla/nsprpub/configure	Tue Mar 20 14:56:49 2007
+*** misc/mozilla/nsprpub/configure	Tue Sep 14 17:14:38 2004
+--- misc/build/mozilla/nsprpub/configure	Thu Mar 29 14:27:08 2007
 ***************
 *** 2724,2729 ****
 --- 2724,2730 ----
@@ -7695,8 +7696,8 @@
   s%@MKSHLIB@%$MKSHLIB%g
   s%@DSO_CFLAGS@%$DSO_CFLAGS%g
   s%@DSO_LDOPTS@%$DSO_LDOPTS%g
-*** misc/mozilla/nsprpub/lib/ds/Makefile.in	Wed Apr  9 23:49:32 2003
---- misc/build/mozilla/nsprpub/lib/ds/Makefile.in	Tue Mar 20 14:56:50 2007
+*** misc/mozilla/nsprpub/lib/ds/Makefile.in	Wed Apr  9 17:49:32 2003
+--- misc/build/mozilla/nsprpub/lib/ds/Makefile.in	Thu Mar 29 14:27:08 2007
 ***************
 *** 80,97 ****
   OS_LIBS = -lc
@@ -7740,8 +7741,8 @@
   endif
   endif
   
-*** misc/mozilla/nsprpub/lib/libc/src/Makefile.in	Wed Apr  9 23:49:35 2003
---- misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in	Tue Mar 20 14:56:50 2007
+*** misc/mozilla/nsprpub/lib/libc/src/Makefile.in	Wed Apr  9 17:49:35 2003
+--- misc/build/mozilla/nsprpub/lib/libc/src/Makefile.in	Thu Mar 29 14:27:09 2007
 ***************
 *** 90,107 ****
   OS_LIBS = -lc
@@ -7785,8 +7786,8 @@
   endif
   endif
   
-*** misc/mozilla/nsprpub/pr/include/prtypes.h	Tue Sep 16 22:30:38 2003
---- misc/build/mozilla/nsprpub/pr/include/prtypes.h	Tue Mar 20 14:56:50 2007
+*** misc/mozilla/nsprpub/pr/include/prtypes.h	Tue Sep 16 16:30:38 2003
+--- misc/build/mozilla/nsprpub/pr/include/prtypes.h	Thu Mar 29 14:27:09 2007
 ***************
 *** 450,456 ****
    */
@@ -7804,8 +7805,8 @@
   typedef wchar_t PRUnichar;
   #else
   typedef PRUint16 PRUnichar;
-*** misc/mozilla/nsprpub/pr/src/misc/prnetdb.c	Thu Sep  2 01:44:37 2004
---- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c	Tue Mar 20 14:56:51 2007
+*** misc/mozilla/nsprpub/pr/src/misc/prnetdb.c	Wed Sep  1 19:44:37 2004
+--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c	Thu Mar 29 14:27:09 2007
 ***************
 *** 105,111 ****
   #define _PR_HAVE_GETPROTO_R_INT
@@ -7824,8 +7825,8 @@
   #define _PR_HAVE_GETPROTO_R
   #define _PR_HAVE_5_ARG_GETPROTO_R
   #endif
-*** misc/mozilla/profile/src/nsProfile.cpp	Sat Apr 24 19:15:40 2004
---- misc/build/mozilla/profile/src/nsProfile.cpp	Tue Mar 20 14:56:51 2007
+*** misc/mozilla/profile/src/nsProfile.cpp	Sat Apr 24 13:15:40 2004
+--- misc/build/mozilla/profile/src/nsProfile.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 37,43 ****
 --- 37,45 ----
@@ -7902,8 +7903,8 @@
       gDirServiceProvider->SetProfileDir(profileDir);  
       mCurrentProfileName.Assign(aCurrentProfile);    
       gProfileDataAccess->SetCurrentProfile(aCurrentProfile);
-*** misc/mozilla/security/coreconf/Linux.mk	Wed Feb 11 03:33:51 2004
---- misc/build/mozilla/security/coreconf/Linux.mk	Tue Mar 20 14:56:52 2007
+*** misc/mozilla/security/coreconf/Linux.mk	Tue Feb 10 21:33:51 2004
+--- misc/build/mozilla/security/coreconf/Linux.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 123,129 ****
   
@@ -7931,8 +7932,8 @@
   DSO_LDFLAGS		=
   
   # INCLUDES += -I/usr/include -Y/usr/include/linux
-*** misc/mozilla/security/coreconf/Linux2.1.mk	Wed Nov  7 21:58:09 2001
---- misc/build/mozilla/security/coreconf/Linux2.1.mk	Tue Mar 20 14:56:52 2007
+*** misc/mozilla/security/coreconf/Linux2.1.mk	Wed Nov  7 15:58:09 2001
+--- misc/build/mozilla/security/coreconf/Linux2.1.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 36,42 ****
   include $(CORE_DEPTH)/coreconf/Linux.mk
@@ -7950,8 +7951,8 @@
           ifdef BUILD_OPT
                   OPTIMIZER       = -O2
           endif
-*** misc/mozilla/security/coreconf/Linux2.2.mk	Wed Nov  7 21:56:18 2001
---- misc/build/mozilla/security/coreconf/Linux2.2.mk	Tue Mar 20 14:56:52 2007
+*** misc/mozilla/security/coreconf/Linux2.2.mk	Wed Nov  7 15:56:18 2001
+--- misc/build/mozilla/security/coreconf/Linux2.2.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 36,42 ****
   include $(CORE_DEPTH)/coreconf/Linux.mk
@@ -7969,8 +7970,8 @@
   ifdef BUILD_OPT
               OPTIMIZER       = -O2
   endif
-*** misc/mozilla/security/coreconf/Linux2.4.mk	Wed Nov  7 21:56:18 2001
---- misc/build/mozilla/security/coreconf/Linux2.4.mk	Tue Mar 20 14:56:52 2007
+*** misc/mozilla/security/coreconf/Linux2.4.mk	Wed Nov  7 15:56:18 2001
+--- misc/build/mozilla/security/coreconf/Linux2.4.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 36,42 ****
   include $(CORE_DEPTH)/coreconf/Linux.mk
@@ -7988,8 +7989,8 @@
   ifdef BUILD_OPT
               OPTIMIZER       = -O2
   endif
-*** misc/mozilla/security/coreconf/Linux2.5.mk	Sun Jan 27 01:45:37 2002
---- misc/build/mozilla/security/coreconf/Linux2.5.mk	Tue Mar 20 14:56:52 2007
+*** misc/mozilla/security/coreconf/Linux2.5.mk	Sat Jan 26 19:45:37 2002
+--- misc/build/mozilla/security/coreconf/Linux2.5.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 36,42 ****
   include $(CORE_DEPTH)/coreconf/Linux.mk
@@ -8007,8 +8008,8 @@
   ifdef BUILD_OPT
               OPTIMIZER       = -O2
   endif
-*** misc/mozilla/security/coreconf/Linux2.6.mk	Sat Jul 19 23:21:50 2003
---- misc/build/mozilla/security/coreconf/Linux2.6.mk	Tue Mar 20 14:56:52 2007
+*** misc/mozilla/security/coreconf/Linux2.6.mk	Sat Jul 19 17:21:50 2003
+--- misc/build/mozilla/security/coreconf/Linux2.6.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 36,42 ****
   include $(CORE_DEPTH)/coreconf/Linux.mk
@@ -8026,8 +8027,8 @@
   ifdef BUILD_OPT
               OPTIMIZER       = -O2
   endif
-*** misc/mozilla/security/coreconf/SunOS5.mk	Sat Oct 16 01:52:29 2004
---- misc/build/mozilla/security/coreconf/SunOS5.mk	Tue Mar 20 14:56:52 2007
+*** misc/mozilla/security/coreconf/SunOS5.mk	Fri Oct 15 19:52:29 2004
+--- misc/build/mozilla/security/coreconf/SunOS5.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 164,175 ****
 --- 164,177 ----
@@ -8055,8 +8056,8 @@
   endif
   
   # -KPIC generates position independent code for use in shared libraries.
-*** misc/mozilla/security/coreconf/WIN954.0.mk	Sat Oct 16 01:52:29 2004
---- misc/build/mozilla/security/coreconf/WIN954.0.mk	Tue Mar 20 14:56:52 2007
+*** misc/mozilla/security/coreconf/WIN954.0.mk	Fri Oct 15 19:52:29 2004
+--- misc/build/mozilla/security/coreconf/WIN954.0.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 64,66 ****
 --- 64,70 ----
@@ -8067,8 +8068,8 @@
 + ifdef NS_USE_GCC
 + NSPR31_LIB_PREFIX = lib
 + endif
-*** misc/mozilla/security/coreconf/command.mk	Fri Feb 15 23:53:12 2002
---- misc/build/mozilla/security/coreconf/command.mk	Tue Mar 20 14:56:52 2007
+*** misc/mozilla/security/coreconf/command.mk	Fri Feb 15 17:53:12 2002
+--- misc/build/mozilla/security/coreconf/command.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 42,48 ****
   LINK_DLL      = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
@@ -8086,8 +8087,118 @@
   		$(XCFLAGS)
   RANLIB        = echo
   TAR           = /bin/tar
-*** misc/mozilla/security/nss/lib/ckfw/builtins/config.mk	Sat Oct 16 01:52:32 2004
---- misc/build/mozilla/security/nss/lib/ckfw/builtins/config.mk	Tue Mar 20 14:56:53 2007
+*** misc/mozilla/security/coreconf/rules.mk	Mon Mar 22 20:56:47 2004
+--- misc/build/mozilla/security/coreconf/rules.mk	Thu Mar 29 14:32:45 2007
+***************
+*** 406,423 ****
+  endif
+  
+  ifdef NEED_ABSOLUTE_PATH
+! abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))
+  else
+! abspath = $(1)
+  endif
+  
+  $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
+  	@$(MAKE_OBJDIR)
+  ifdef USE_NT_C_SYNTAX
+! 	$(CC) -Fo$@ -c $(CFLAGS) $(call abspath,$<)
+  else
+  ifdef NEED_ABSOLUTE_PATH
+! 	$(CC) -o $@ -c $(CFLAGS) $(call abspath,$<)
+  else
+  	$(CC) -o $@ -c $(CFLAGS) $<
+  endif
+--- 406,423 ----
+  endif
+  
+  ifdef NEED_ABSOLUTE_PATH
+! mozabspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))
+  else
+! mozabspath = $(1)
+  endif
+  
+  $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
+  	@$(MAKE_OBJDIR)
+  ifdef USE_NT_C_SYNTAX
+! 	$(CC) -Fo$@ -c $(CFLAGS) $(call mozabspath,$<)
+  else
+  ifdef NEED_ABSOLUTE_PATH
+! 	$(CC) -o $@ -c $(CFLAGS) $(call mozabspath,$<)
+  else
+  	$(CC) -o $@ -c $(CFLAGS) $<
+  endif
+***************
+*** 425,434 ****
+  
+  $(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
+  ifdef USE_NT_C_SYNTAX
+! 	$(CC) -Fo$@ -c $(CFLAGS) $(call abspath,$<)
+  else
+  ifdef NEED_ABSOLUTE_PATH
+! 	$(CC) -o $@ -c $(CFLAGS) $(call abspath,$<)
+  else
+  	$(CC) -o $@ -c $(CFLAGS) $<
+  endif
+--- 425,434 ----
+  
+  $(PROG_PREFIX)%$(OBJ_SUFFIX): %.c
+  ifdef USE_NT_C_SYNTAX
+! 	$(CC) -Fo$@ -c $(CFLAGS) $(call mozabspath,$<)
+  else
+  ifdef NEED_ABSOLUTE_PATH
+! 	$(CC) -o $@ -c $(CFLAGS) $(call mozabspath,$<)
+  else
+  	$(CC) -o $@ -c $(CFLAGS) $<
+  endif
+***************
+*** 457,466 ****
+  $(OBJDIR)/$(PROG_PREFIX)%: %.cpp
+  	@$(MAKE_OBJDIR)
+  ifdef USE_NT_C_SYNTAX
+! 	$(CCC) -Fo$@ -c $(CFLAGS) $(call abspath,$<)
+  else
+  ifdef NEED_ABSOLUTE_PATH
+! 	$(CCC) -o $@ -c $(CFLAGS) $(call abspath,$<)
+  else
+  	$(CCC) -o $@ -c $(CFLAGS) $<
+  endif
+--- 457,466 ----
+  $(OBJDIR)/$(PROG_PREFIX)%: %.cpp
+  	@$(MAKE_OBJDIR)
+  ifdef USE_NT_C_SYNTAX
+! 	$(CCC) -Fo$@ -c $(CFLAGS) $(call mozabspath,$<)
+  else
+  ifdef NEED_ABSOLUTE_PATH
+! 	$(CCC) -o $@ -c $(CFLAGS) $(call mozabspath,$<)
+  else
+  	$(CCC) -o $@ -c $(CFLAGS) $<
+  endif
+***************
+*** 481,490 ****
+  	rm -f $(OBJDIR)/t_$*.cc
+  else
+  ifdef USE_NT_C_SYNTAX
+! 	$(CCC) -Fo$@ -c $(CFLAGS) $(call abspath,$<)
+  else
+  ifdef NEED_ABSOLUTE_PATH
+! 	$(CCC) -o $@ -c $(CFLAGS) $(call abspath,$<)
+  else
+  	$(CCC) -o $@ -c $(CFLAGS) $<
+  endif
+--- 481,490 ----
+  	rm -f $(OBJDIR)/t_$*.cc
+  else
+  ifdef USE_NT_C_SYNTAX
+! 	$(CCC) -Fo$@ -c $(CFLAGS) $(call mozabspath,$<)
+  else
+  ifdef NEED_ABSOLUTE_PATH
+! 	$(CCC) -o $@ -c $(CFLAGS) $(call mozabspath,$<)
+  else
+  	$(CCC) -o $@ -c $(CFLAGS) $<
+  endif
+*** misc/mozilla/security/nss/lib/ckfw/builtins/config.mk	Fri Oct 15 19:52:32 2004
+--- misc/build/mozilla/security/nss/lib/ckfw/builtins/config.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 59,67 ****
   DSO_LDOPTS = -bundle
@@ -8100,8 +8211,8 @@
 - endif
   
 --- 59,62 ----
-*** misc/mozilla/security/nss/lib/freebl/Makefile	Sat Oct 16 01:52:33 2004
---- misc/build/mozilla/security/nss/lib/freebl/Makefile	Tue Mar 20 14:56:53 2007
+*** misc/mozilla/security/nss/lib/freebl/Makefile	Fri Oct 15 19:52:33 2004
+--- misc/build/mozilla/security/nss/lib/freebl/Makefile	Thu Mar 29 14:27:09 2007
 ***************
 *** 179,189 ****
   
@@ -8133,8 +8244,8 @@
   endif # NS_USE_GCC
   ifdef USE_PURE_32
   # this builds for Sparc v8 pure 32-bit architecture
-*** misc/mozilla/security/nss/lib/nss/config.mk	Sat Oct 16 01:52:33 2004
---- misc/build/mozilla/security/nss/lib/nss/config.mk	Tue Mar 20 14:56:53 2007
+*** misc/mozilla/security/nss/lib/nss/config.mk	Fri Oct 15 19:52:33 2004
+--- misc/build/mozilla/security/nss/lib/nss/config.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 107,120 ****
   # The -R '$ORIGIN' linker option instructs this library to search for its
@@ -8164,8 +8275,8 @@
   
   
   ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
-*** misc/mozilla/security/nss/lib/nss/nss.def	Sat Oct 16 01:52:33 2004
---- misc/build/mozilla/security/nss/lib/nss/nss.def	Tue Mar 20 14:56:53 2007
+*** misc/mozilla/security/nss/lib/nss/nss.def	Fri Oct 15 19:52:33 2004
+--- misc/build/mozilla/security/nss/lib/nss/nss.def	Thu Mar 29 14:27:09 2007
 ***************
 *** 60,65 ****
 --- 60,66 ----
@@ -8176,11 +8287,11 @@
   CERT_DecodeDERCrl;
   CERT_DestroyCertificateRequest;
   CERT_DestroyCertList;
-*** misc/mozilla/security/nss/lib/pki1/oiddata.h	Fri Jan  4 06:22:07 2002
---- misc/build/mozilla/security/nss/lib/pki1/oiddata.h	Tue Mar 20 14:56:53 2007
+*** misc/mozilla/security/nss/lib/pki1/oiddata.h	Fri Jan  4 00:22:07 2002
+--- misc/build/mozilla/security/nss/lib/pki1/oiddata.h	Thu Mar 29 14:27:09 2007
 ***************
 *** 39,49 ****
-  static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile: oiddata.h,v $ $Revision: 1.1 $ $Date: 2002/01/04 05:22:07 $ $Name: MOZILLA_1_7_5_RELEASE $ ; @(#) $RCSfile: oiddata.h,v $ $Revision: 1.1 $ $Date: 2002/01/04 05:22:07 $ $Name: MOZILLA_1_7_5_RELEASE $";
+  static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
   #endif /* DEBUG */
   
   #ifndef NSSPKI1T_H
@@ -8192,7 +8303,7 @@
   
   /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
 --- 39,50 ----
-  static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile: oiddata.h,v $ $Revision: 1.1 $ $Date: 2002/01/04 05:22:07 $ $Name: MOZILLA_1_7_5_RELEASE $ ; @(#) $RCSfile: oiddata.h,v $ $Revision: 1.1 $ $Date: 2002/01/04 05:22:07 $ $Name: MOZILLA_1_7_5_RELEASE $";
+  static const char OIDDATA_CVS_ID[] = "@(#) $RCSfile$ $Revision$ $Date$ $Name$ ; @(#) $RCSfile$ $Revision$ $Date$ $Name$";
   #endif /* DEBUG */
   
 + #include "pki1t.h"
@@ -8204,8 +8315,8 @@
   extern const PRUint32 nss_builtin_oid_count;
   
   /*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
-*** misc/mozilla/security/nss/lib/smime/config.mk	Sat Oct 16 01:52:34 2004
---- misc/build/mozilla/security/nss/lib/smime/config.mk	Tue Mar 20 14:56:54 2007
+*** misc/mozilla/security/nss/lib/smime/config.mk	Fri Oct 15 19:52:34 2004
+--- misc/build/mozilla/security/nss/lib/smime/config.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 85,94 ****
   	../pkcs12 \
@@ -8219,8 +8330,8 @@
 - endif
 - 
 --- 85,87 ----
-*** misc/mozilla/security/nss/lib/softoken/config.mk	Sat Oct 16 01:52:35 2004
---- misc/build/mozilla/security/nss/lib/softoken/config.mk	Tue Mar 20 14:56:54 2007
+*** misc/mozilla/security/nss/lib/softoken/config.mk	Fri Oct 15 19:52:35 2004
+--- misc/build/mozilla/security/nss/lib/softoken/config.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 83,94 ****
   	$(NULL)
@@ -8236,8 +8347,8 @@
   DEFINES += -DDBM_USING_NSPR
   endif
 --- 83,88 ----
-*** misc/mozilla/security/nss/lib/ssl/config.mk	Sat Oct 16 01:52:35 2004
---- misc/build/mozilla/security/nss/lib/ssl/config.mk	Tue Mar 20 14:56:54 2007
+*** misc/mozilla/security/nss/lib/ssl/config.mk	Fri Oct 15 19:52:35 2004
+--- misc/build/mozilla/security/nss/lib/ssl/config.mk	Thu Mar 29 14:27:09 2007
 ***************
 *** 78,87 ****
   EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
@@ -8251,8 +8362,8 @@
 - 
   endif
 --- 78,81 ----
-*** misc/mozilla/uriloader/exthandler/win/nsOSHelperAppService.cpp	Wed Oct 20 18:26:10 2004
---- misc/build/mozilla/uriloader/exthandler/win/nsOSHelperAppService.cpp	Tue Mar 20 14:56:55 2007
+*** misc/mozilla/uriloader/exthandler/win/nsOSHelperAppService.cpp	Wed Oct 20 12:26:10 2004
+--- misc/build/mozilla/uriloader/exthandler/win/nsOSHelperAppService.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 171,183 ****
 --- 171,191 ----
@@ -8291,8 +8402,8 @@
       }
       else {
         nsCAutoString ansiKey;
-*** misc/mozilla/webshell/tests/viewer/Makefile.in	Thu Apr  8 10:06:32 2004
---- misc/build/mozilla/webshell/tests/viewer/Makefile.in	Tue Mar 20 14:56:55 2007
+*** misc/mozilla/webshell/tests/viewer/Makefile.in	Thu Apr  8 04:06:32 2004
+--- misc/build/mozilla/webshell/tests/viewer/Makefile.in	Thu Mar 29 14:27:09 2007
 ***************
 *** 163,169 ****
   GTK_LIBS		= unix/gtk/libviewer_gtk_s.a -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS)
@@ -8310,8 +8421,8 @@
   
   EXTRA_DEPS		= \
   			$(XP_DIST_DEP_LIBS) \
-*** misc/mozilla/widget/src/gtk2/nsDragService.cpp	Thu Oct 30 02:48:41 2003
---- misc/build/mozilla/widget/src/gtk2/nsDragService.cpp	Tue Mar 20 14:56:55 2007
+*** misc/mozilla/widget/src/gtk2/nsDragService.cpp	Wed Oct 29 21:48:41 2003
+--- misc/build/mozilla/widget/src/gtk2/nsDragService.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 838,844 ****
               (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
@@ -8397,8 +8508,8 @@
                               PR_LOG(sDragLm, PR_LOG_DEBUG,
                                      ("automatically adding target %s with \
                                      id %ld\n", urlTarget->target, urlAtom));
-*** misc/mozilla/widget/src/windows/nsDataObj.cpp	Wed Oct 27 07:50:31 2004
---- misc/build/mozilla/widget/src/windows/nsDataObj.cpp	Tue Mar 20 14:56:56 2007
+*** misc/mozilla/widget/src/windows/nsDataObj.cpp	Wed Oct 27 01:50:31 2004
+--- misc/build/mozilla/widget/src/windows/nsDataObj.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 504,515 ****
 --- 504,523 ----
@@ -8422,8 +8533,8 @@
         } 
       }
       titleStr[lenTitleStr] = '\0';
-*** misc/mozilla/widget/src/windows/nsFilePicker.cpp	Wed Dec  8 22:58:30 2004
---- misc/build/mozilla/widget/src/windows/nsFilePicker.cpp	Tue Mar 20 14:56:56 2007
+*** misc/mozilla/widget/src/windows/nsFilePicker.cpp	Wed Dec  8 16:58:30 2004
+--- misc/build/mozilla/widget/src/windows/nsFilePicker.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 117,123 ****
 --- 117,127 ----
@@ -8515,8 +8626,8 @@
           }
         }
       }
-*** misc/mozilla/widget/src/windows/nsWindow.cpp	Sat May 29 22:27:51 2004
---- misc/build/mozilla/widget/src/windows/nsWindow.cpp	Tue Mar 20 14:56:56 2007
+*** misc/mozilla/widget/src/windows/nsWindow.cpp	Sat May 29 16:27:51 2004
+--- misc/build/mozilla/widget/src/windows/nsWindow.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 444,449 ****
 --- 444,452 ----
@@ -8638,8 +8749,8 @@
                               nsCRT::strlen(mIMEReconvertUnicode),
                               (LPSTR) (aData + sizeof(RECONVERTSTRING)),
                               len,
-*** misc/mozilla/xpcom/base/nsStackFrameUnix.cpp	Mon Mar  8 08:47:44 2004
---- misc/build/mozilla/xpcom/base/nsStackFrameUnix.cpp	Tue Mar 20 14:56:56 2007
+*** misc/mozilla/xpcom/base/nsStackFrameUnix.cpp	Mon Mar  8 02:47:44 2004
+--- misc/build/mozilla/xpcom/base/nsStackFrameUnix.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 78,102 ****
   }
@@ -8683,8 +8794,8 @@
   
     int skip = 2;
     for ( ; (void**)*bp > bp; bp = (void**)*bp) {
-*** misc/mozilla/xpcom/base/nsTraceRefcntImpl.cpp	Wed Feb 11 08:16:10 2004
---- misc/build/mozilla/xpcom/base/nsTraceRefcntImpl.cpp	Tue Mar 20 14:56:56 2007
+*** misc/mozilla/xpcom/base/nsTraceRefcntImpl.cpp	Wed Feb 11 02:16:10 2004
+--- misc/build/mozilla/xpcom/base/nsTraceRefcntImpl.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 50,68 ****
   
@@ -8796,8 +8907,8 @@
   nsTraceRefcntImpl::WalkTheStack(FILE* aStream)
   {
   	fprintf(aStream, "write me, dammit!\n");
-*** misc/mozilla/xpcom/base/nscore.h	Thu Mar 25 20:55:16 2004
---- misc/build/mozilla/xpcom/base/nscore.h	Tue Mar 20 14:56:56 2007
+*** misc/mozilla/xpcom/base/nscore.h	Thu Mar 25 15:55:16 2004
+--- misc/build/mozilla/xpcom/base/nscore.h	Thu Mar 29 14:27:09 2007
 ***************
 *** 282,288 ****
      * commercial build.  When this is fixed there will be no need for the
@@ -8815,8 +8926,8 @@
       typedef wchar_t PRUnichar;
     #else
       typedef PRUint16 PRUnichar;
-*** misc/mozilla/xpcom/io/nsLocalFileWin.cpp	Thu May 13 22:59:45 2004
---- misc/build/mozilla/xpcom/io/nsLocalFileWin.cpp	Tue Mar 20 14:56:57 2007
+*** misc/mozilla/xpcom/io/nsLocalFileWin.cpp	Thu May 13 16:59:45 2004
+--- misc/build/mozilla/xpcom/io/nsLocalFileWin.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 552,558 ****
 --- 552,562 ----
@@ -8831,8 +8942,8 @@
               else
                   rv = NS_ERROR_FAILURE;
   
-*** misc/mozilla/xpcom/io/nsNativeCharsetUtils.cpp	Mon Nov  8 15:44:27 2004
---- misc/build/mozilla/xpcom/io/nsNativeCharsetUtils.cpp	Tue Mar 20 14:56:57 2007
+*** misc/mozilla/xpcom/io/nsNativeCharsetUtils.cpp	Mon Nov  8 09:44:27 2004
+--- misc/build/mozilla/xpcom/io/nsNativeCharsetUtils.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 890,896 ****
 --- 890,900 ----
@@ -8875,8 +8986,8 @@
                                 &defaultChar, NULL);
       }
       return NS_OK;
-*** misc/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h	Wed Jun 25 00:12:34 2003
---- misc/build/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h	Tue Mar 20 14:56:57 2007
+*** misc/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h	Tue Jun 24 18:12:34 2003
+--- misc/build/mozilla/xpcom/reflect/xptinfo/public/xptinfo.h	Thu Mar 29 14:27:09 2007
 ***************
 *** 132,138 ****
           }
@@ -8911,11 +9022,11 @@
       {
           T_I8                = TD_INT8             ,
           T_I16               = TD_INT16            ,
-*** misc/mozilla/xpfe/bootstrap/Makefile.in	Thu Jun 24 20:58:48 2004
---- misc/build/mozilla/xpfe/bootstrap/Makefile.in	Tue Mar 20 14:56:57 2007
+*** misc/mozilla/xpfe/bootstrap/Makefile.in	Thu Jun 24 14:58:48 2004
+--- misc/build/mozilla/xpfe/bootstrap/Makefile.in	Thu Mar 29 14:27:09 2007
 ***************
-*** 84,93 ****
---- 84,96 ----
+*** 84,94 ****
+--- 84,97 ----
   
   include $(topsrcdir)/config/config.mk
   
@@ -8925,12 +9036,13 @@
   PROGRAM		= mozilla$(BIN_SUFFIX)
   else
   PROGRAM		= mozilla-bin$(BIN_SUFFIX)
-+ endif
   endif
++ endif
   
   # Force applications to be built non-statically
-*** misc/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp	Tue Dec 14 17:26:56 2004
---- misc/build/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp	Tue Mar 20 14:56:57 2007
+  # when building the mozcomps meta component
+*** misc/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp	Tue Dec 14 11:26:56 2004
+--- misc/build/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp	Thu Mar 29 14:27:09 2007
 ***************
 *** 113,119 ****
 --- 113,123 ----
-- 
cgit