Tag: cws_src680_dba24d User: oj Date: 2007-11-07 07:51:28+0000 Modified: dba/dbaccess/source/ui/dlg/advancedsettings.hrc
Log: merge conflicts File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: advancedsettings.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/advancedsettings.hrc?r1=1.2&r2=1.2.2.1 Delta lines: +3 -2 ------------------- --- advancedsettings.hrc 2007-11-01 15:09:14+0000 1.2 +++ advancedsettings.hrc 2007-11-07 07:51:25+0000 1.2.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: advancedsettings.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.2.1 $ * - * last change: $Author: hr $ $Date: 2007/11/01 15:09:14 $ + * last change: $Author: oj $ $Date: 2007/11/07 07:51:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,6 +67,7 @@ #define CB_DOSLINEENDS 11 #define CB_AS_BEFORE_CORR_NAME 12 #define CB_CHECK_REQUIRED 13 +#define CB_IGNORECURRENCY 14 #define ET_AUTOINCREMENTVALUE 1 #define ET_RETRIEVE_AUTO 2 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
