From c4008ef54630b560792aa288437db1179ad96095 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
Date: Tue, 2 Oct 2012 14:13:40 +0100
Subject: re-base on ALv2 code. Includes:

    tkr41: #117828# office crash fixed . (null pointer) + add unit test
    Patch contributed by Tobias Krause
    http://svn.apache.org/viewvc?view=revision&revision=1172105

    Do not add targets for junit tests when junit is disabled.
    Patch contributed by Andre Fischer
    http://svn.apache.org/viewvc?view=revision&revision=1241508

    remove the OutDev::GetKernPair* stubs completely
    Patch contributed by Herbert Duerr
    http://svn.apache.org/viewvc?view=revision&revision=1179221

    reverting un-necessary OS/2 conditionals.
---
 .../fragments/internalgraphicfilters/psd_Import.xcu     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu')

diff --git a/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu
index cbfc6e4710e7..ce2c3066b8da 100644
--- a/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu
+++ b/filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu
@@ -1,3 +1,20 @@
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * 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 incorporates work covered by the following license notice:
+ *
+ *   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 .
+-->
     <node oor:name="psd_Import" oor:op="replace"  >
         <prop oor:name="Type"><value>psd_Adobe_Photoshop</value></prop>
         <prop oor:name="FormatName"><value>ipd</value></prop>
-- 
cgit