Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1198512 -
 /incubator/ooo/trunk/main/xmerge/inc/pch/precompiled_xmerge.hxx
Date: Sun, 06 Nov 2011 17:48:18 -0000
To: ooo-commits@incubator.apache.org
From: arist@apache.org
Message-Id: <20111106174819.0659E2388900@eris.apache.org>

Author: arist
Date: Sun Nov  6 17:48:18 2011
New Revision: 1198512

URL: http://svn.apache.org/viewvc?rev=1198512&view=rev
Log:
Update headers to Alv2 headers

Modified:
    incubator/ooo/trunk/main/xmerge/inc/pch/precompiled_xmerge.hxx

Modified: incubator/ooo/trunk/main/xmerge/inc/pch/precompiled_xmerge.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/xmerge/inc/pch/precompiled_xmerge.hxx?rev=1198512&r1=1198511&r2=1198512&view=diff
==============================================================================
--- incubator/ooo/trunk/main/xmerge/inc/pch/precompiled_xmerge.hxx (original)
+++ incubator/ooo/trunk/main/xmerge/inc/pch/precompiled_xmerge.hxx Sun Nov  6 17:48:18 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
- * <http://www.openoffice.org/license.html>
- * 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.
+ * 
+ *************************************************************/
+
+
 
 // MARKER(update_precomp.py): Generated on 2006-09-01 17:50:19.373276