INTEGRATION: CWS pchfix02 (1.6.60); FILE MERGED

2006/09/01 17:20:42 kaib 1.6.60.1: #i68856# Added header markers and pch files
This commit is contained in:
Oliver Bolte 2006-09-16 14:21:19 +00:00
parent a66fa8a769
commit 267744e7a9

View file

@ -4,9 +4,9 @@
*
* $RCSfile: mergehelper.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: rt $ $Date: 2005-09-08 04:17:55 $
* last change: $Author: obo $ $Date: 2006-09-16 15:21:19 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -33,6 +33,9 @@
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_configmgr.hxx"
#include <stdio.h>
#include "mergehelper.hxx"