diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:03:39 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-08 15:03:39 +0000 |
commit | 572674632c7bb1f943d514b3aeb0beab2f2975ad (patch) | |
tree | 75bbd42bd23ac07ebbfbf7bb92fb0079f2daa3a7 /jvmfwk/source | |
parent | 26f32a6b6a51028234c92151caf96d44ce42e2a2 (diff) |
INTEGRATION: CWS ooo20040704 (1.18.8); FILE MERGED
2004/08/09 14:39:59 vg 1.18.8.2: RESYNC MERGED 1.18 1.19
Everything below this line will be added to the revision comment.
2004/06/28 12:44:25 cmc 1.18.8.1: #i30801 allow using system libs if possible
Diffstat (limited to 'jvmfwk/source')
-rw-r--r-- | jvmfwk/source/framework.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx index 8a0ee27bb62a..c6238ace4d09 100644 --- a/jvmfwk/source/framework.cxx +++ b/jvmfwk/source/framework.cxx @@ -2,9 +2,9 @@ * * $RCSfile: framework.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hr $ $Date: 2004-07-23 11:54:39 $ + * last change: $Author: rt $ $Date: 2004-09-08 16:03:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -58,7 +58,7 @@ * * ************************************************************************/ -#include "external/boost/scoped_array.hpp" +#include "boost/scoped_array.hpp" #include "rtl/ustring.hxx" #include "rtl/ustrbuf.hxx" #include "osl/thread.hxx" |