summaryrefslogtreecommitdiff
path: root/sal/rtl
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2004-09-08 15:44:42 +0000
committerRüdiger Timm <rt@openoffice.org>2004-09-08 15:44:42 +0000
commit6d99aa946f607ab3fc5acd943e596339f6b8c1f0 (patch)
tree786d18a429fa7b3b07c18cce9eb8656a58b08514 /sal/rtl
parent2950454ef28ffd9708cadc1d1d9f867906cfc823 (diff)
INTEGRATION: CWS ooo20040704 (1.28.6); FILE MERGED
2004/07/19 16:24:51 svesik 1.28.6.3: RESYNC: (1.28-1.29); FILE MERGED 2004/07/02 09:06:49 cmc 1.28.6.2: #i30891# revert header and namespace change 2004/06/28 11:32:51 cmc 1.28.6.1: #i30801 allow using system stl if possible
Diffstat (limited to 'sal/rtl')
-rw-r--r--sal/rtl/source/bootstrap.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx
index f20a40df635a..9932751911d9 100644
--- a/sal/rtl/source/bootstrap.cxx
+++ b/sal/rtl/source/bootstrap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bootstrap.cxx,v $
*
- * $Revision: 1.30 $
+ * $Revision: 1.31 $
*
- * last change: $Author: obo $ $Date: 2004-09-08 16:16:10 $
+ * last change: $Author: rt $ $Date: 2004-09-08 16:44:42 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,9 +97,8 @@
#include "internal/allocator.hxx"
#endif
-#include <list>
#include <hash_map>
-
+#include <list>
using namespace ::rtl;
using namespace ::osl;