[Libreoffice-commits] .: scp2/source

Jesús Corrius jcorrius at kemper.freedesktop.org
Wed Feb 22 02:07:41 PST 2012


 scp2/source/ooo/stdlib.scp |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 1f6e33c7c349755820448f4bdfe0ce0eb4a039a6
Author: Jesús Corrius <jesus at softcatala.org>
Date:   Wed Feb 22 11:05:42 2012 +0100

    Revert "Update header license for Fridrich", as the old license was a more accurate representation of reality.
    
    This reverts commit 1dd5b991258424a19dc60b053d044db66fe3ba1a.

diff --git a/scp2/source/ooo/stdlib.scp b/scp2/source/ooo/stdlib.scp
index 63656e1..700b35b 100644
--- a/scp2/source/ooo/stdlib.scp
+++ b/scp2/source/ooo/stdlib.scp
@@ -1,29 +1,29 @@
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+/*************************************************************************
  *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- * Major Contributor(s):
- * Fridrich Strba <fridrich.strba at bluewin.ch> (initial developer)
+ * This file is part of OpenOffice.org.
  *
- * All Rights Reserved.
+ * 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.
  *
- * For minor contributions see the git repository.
+ * 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).
  *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
+ * 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"
 


More information about the Libreoffice-commits mailing list