Tag: cws_src680_mozab05 User: windly Date: 05/01/31 17:50:33 Modified: /dba/dbaccess/source/ui/dlg/ dbwizsetup.cxx
Log: #10000# fix a resync conflict File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.3.6.4&r2=1.3.6.5 Delta lines: +4 -8 ------------------- --- dbwizsetup.cxx 31 Jan 2005 08:19:02 -0000 1.3.6.4 +++ dbwizsetup.cxx 1 Feb 2005 01:50:30 -0000 1.3.6.5 @@ -2,9 +2,9 @@ * * $RCSfile: dbwizsetup.cxx,v $ * - * $Revision: 1.3.6.4 $ + * $Revision: 1.3.6.5 $ * - * last change: $Author: windly $ $Date: 2005/01/31 08:19:02 $ + * last change: $Author: windly $ $Date: 2005/02/01 01:50:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -261,13 +261,9 @@ #define OUTLOOK_PATH 14 #define MOZILLA_PATH 15 #define EVOLUTION_PATH 16 -<<<<<<< dbwizsetup.cxx #define THUNDERBIRD_PATH 17 #define CREATENEW_PATH 18 -======= -#define CREATENEW_PATH 17 -#define USERDEFINED_PATH 18 ->>>>>>> 1.8 +#define USERDEFINED_PATH 19 OFinalDBPageSetup* pFinalPage; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
