From 6c1dd94d78cbee8e698755060d97c4a09ecb1b43 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 26 Jun 2012 09:49:35 +0100 Subject: re-base on ALv2 code. --- unoil/climaker/cli_oootypes_config | 17 +++++++++++++++++ unoil/climaker/version.txt | 35 +++++++++++++---------------------- 2 files changed, 30 insertions(+), 22 deletions(-) (limited to 'unoil/climaker') diff --git a/unoil/climaker/cli_oootypes_config b/unoil/climaker/cli_oootypes_config index 433c8a51889f..9f436e84b2e6 100644 --- a/unoil/climaker/cli_oootypes_config +++ b/unoil/climaker/cli_oootypes_config @@ -1,4 +1,21 @@ + diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt index f59c2f9482b4..abc28bc42473 100644 --- a/unoil/climaker/version.txt +++ b/unoil/climaker/version.txt @@ -1,32 +1,23 @@ -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# 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. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.apache.org/licenses/LICENSE-2.0 . # -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* CLI_OOOTYPES_NEW_VERSION=1.0.8.0 CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.7.0 -CLI_OOOTYPES_POLICY_VERSION=8.0.0.0 +CLI_OOOTYPES_POLICY_VERSION=8.0.0.0 CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes -- cgit v1.2.3