Tag: cws_src680_sb59 User: sb Date: 2006/09/08 01:22:16 Modified: dba/dbaccess/source/ui/app/AppController.cxx
Log: Manually resolved merge conflicts against SRC680m183. File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppController.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppController.cxx?r1=1.32.4.2&r2=1.32.4.3 Delta lines: +5 -5 ------------------- --- AppController.cxx 29 Aug 2006 11:44:25 -0000 1.32.4.2 +++ AppController.cxx 8 Sep 2006 08:22:13 -0000 1.32.4.3 @@ -4,9 +4,9 @@ * * $RCSfile: AppController.cxx,v $ * - * $Revision: 1.32.4.2 $ + * $Revision: 1.32.4.3 $ * - * last change: $Author: sb $ $Date: 2006/08/29 11:44:25 $ + * last change: $Author: sb $ $Date: 2006/09/08 08:22:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
