diff options
| author | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
| commit | e5ce011c3f32f53ef073aec5485450b2588b656a (patch) | |
| tree | 8a838a53bcdd70cc3d4cdbca0ebe07504790952e /filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu | |
| parent | c6b26144c93aa5222e4260c5b0ef45ce5bdc18d2 (diff) | |
| parent | e74fc93e4aba7887e6a278cc44c4bc0962471065 (diff) | |
Merge branch 'master' into feature/killsdf
Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk
Diffstat (limited to 'filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu')
| -rw-r--r-- | filter/source/config/fragments/internalgraphicfilters/psd_Import.xcu | 17 |
1 files changed, 17 insertions, 0 deletions
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> |