summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2008-07-22 16:11:35 +0000
committerOliver Bolte <obo@openoffice.org>2008-07-22 16:11:35 +0000
commit04b966247d3e2bcdb6bf3d3ff4927e4f8da9909a (patch)
treea9acc723f7eb87c0450f865ce92c9bbd77c13e7d /sal
parent26ce9ac1f3f7f3c354a664a9754230ec7dd85c28 (diff)
INTEGRATION: CWS os2port03 (1.7.6); FILE MERGED
2008/07/16 12:26:23 obr 1.7.6.3: RESYNC: (1.8-1.14); FILE MERGED 2008/01/15 13:57:41 obr 1.7.6.2: RESYNC: (1.7-1.8); FILE MERGED 2008/01/14 17:01:01 ydario 1.7.6.1: remove slash from macro.hxx, it is used as path separator. Issue number:i85203 Submitted by:ydario
Diffstat (limited to 'sal')
-rw-r--r--sal/rtl/source/macro.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx
index ae29e13e97bf..cebbc3f97346 100644
--- a/sal/rtl/source/macro.hxx
+++ b/sal/rtl/source/macro.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: macro.hxx,v $
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
* This file is part of OpenOffice.org.
*
@@ -38,7 +38,7 @@
#if defined WIN32
#define THIS_OS "Windows"
#elif defined OS2
-#define THIS_OS "OS/2"
+#define THIS_OS "OS2"
#elif defined SOLARIS
#define THIS_OS "Solaris"
#elif defined LINUX