diff options
author | Oliver Bolte <obo@openoffice.org> | 2009-02-20 10:24:14 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2009-02-20 10:24:14 +0000 |
commit | c089b13934b9c5e8ce1bd27085eb5656db9e191e (patch) | |
tree | 7b93973fda3f013537376ab9919ab4be750de03c /scp2 | |
parent | 8a6d3b5ce6f1cb528d4270201d06ee055c4ebaf1 (diff) |
#i99305#,#i99132# remove DOS lineends, remove solenv/unxmacxp/inc/poll.h
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/vc_redist.scp | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index afbbd452517f..92a1d704c650 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -1,48 +1,48 @@ -/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2009 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: vc_redist.scp,v $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#if defined(WITH_VC_REDIST)
-WindowsCustomAction gid_Customaction_InstallRuntime
- Name = "InstallRuntime";
- Typ = "98";
- Source = "SystemFolder";
- Target = "[SourceDir]redist\vcredist_x86.exe /qb";
- Inbinarytable = 0;
- Styles = (NO_FILE);
- Assignment1 = ("InstallUISequence", "VersionNT >= 600 and VersionNT < 700 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction");
-End
-
-ScpAction scp_Copy_vcredist_x86
- Copy = "vcredist_x86.exe";
- Name = "vcredist_x86.exe";
- Subdir = "redist";
-End
-#endif
+/************************************************************************* +* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2009 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: vc_redist.scp,v $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * +************************************************************************/ + +#include "macros.inc" + +#if defined(WITH_VC_REDIST) +WindowsCustomAction gid_Customaction_InstallRuntime + Name = "InstallRuntime"; + Typ = "98"; + Source = "SystemFolder"; + Target = "[SourceDir]redist\vcredist_x86.exe /qb"; + Inbinarytable = 0; + Styles = (NO_FILE); + Assignment1 = ("InstallUISequence", "VersionNT >= 600 and VersionNT < 700 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction"); +End + +ScpAction scp_Copy_vcredist_x86 + Copy = "vcredist_x86.exe"; + Name = "vcredist_x86.exe"; + Subdir = "redist"; +End +#endif |