Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A7161731A for ; Wed, 30 Nov 2011 01:01:03 +0000 (UTC) Received: (qmail 23450 invoked by uid 500); 30 Nov 2011 01:01:03 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 23424 invoked by uid 500); 30 Nov 2011 01:01:03 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 23402 invoked by uid 99); 30 Nov 2011 01:01:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Nov 2011 01:01:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Nov 2011 01:00:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1EE882388A32; Wed, 30 Nov 2011 01:00:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1208169 - in /incubator/ooo/trunk/main/desktop/win32/source: QuickStart/QuickStart.cpp setup/setup.cpp Date: Wed, 30 Nov 2011 01:00:38 -0000 To: ooo-commits@incubator.apache.org From: arist@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111130010039.1EE882388A32@eris.apache.org> Author: arist Date: Wed Nov 30 01:00:38 2011 New Revision: 1208169 URL: http://svn.apache.org/viewvc?rev=1208169&view=rev Log: Update headers to Alv2 headers Modified: incubator/ooo/trunk/main/desktop/win32/source/QuickStart/QuickStart.cpp incubator/ooo/trunk/main/desktop/win32/source/setup/setup.cpp Modified: incubator/ooo/trunk/main/desktop/win32/source/QuickStart/QuickStart.cpp URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/win32/source/QuickStart/QuickStart.cpp?rev=1208169&r1=1208168&r2=1208169&view=diff ============================================================================== --- incubator/ooo/trunk/main/desktop/win32/source/QuickStart/QuickStart.cpp (original) +++ incubator/ooo/trunk/main/desktop/win32/source/QuickStart/QuickStart.cpp Wed Nov 30 01:00:38 2011 @@ -1,3 +1,24 @@ +/************************************************************** + * + * 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 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + // QuickStart.cpp : Defines the entry point for the application. // Modified: incubator/ooo/trunk/main/desktop/win32/source/setup/setup.cpp URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/desktop/win32/source/setup/setup.cpp?rev=1208169&r1=1208168&r2=1208169&view=diff ============================================================================== --- incubator/ooo/trunk/main/desktop/win32/source/setup/setup.cpp (original) +++ incubator/ooo/trunk/main/desktop/win32/source/setup/setup.cpp Wed Nov 30 01:00:38 2011 @@ -1,29 +1,25 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +/************************************************************** * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ + * 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 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + *************************************************************/ + + #define WIN // scope W32 API