diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:11:35 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 16:11:35 +0000 |
| commit | a0a4639b6aa048180f86e4ec4ce5e320cfda1bcc (patch) | |
| tree | bcdaafe8696488eadbe225322dc108588ddf3e7e /sal/rtl | |
| parent | b7dafe14aa0555bf6c488f1d23ccc4889aa1ce9b (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/rtl')
| -rw-r--r-- | sal/rtl/source/macro.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx index 452ecfd70..c43f7dbc4 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 |