diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-07-11 19:49:09 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-07-13 21:38:47 +0100 |
| commit | 2c47c9989e308ddef22066607795eb3feef9f76b (patch) | |
| tree | 35a3526c8133d25a502e5cbd01effe180e6b6339 /idl/Module_idl.mk | |
| parent | 424d0fedd55699910830a5a342d54b8516b7b5c7 (diff) | |
re-base on ALv2 code. Includes:
cws mba34issues01: #i117709#: make sure that parent of error message box is visible
Patch contributed by Mathias Bauer
http://svn.apache.org/viewvc?view=revision&revision=1172346
i#119036 - improve user experience of certification dialog - only shown once
Patch contributed by Oliver-Rainer Wittmann
http://svn.apache.org/viewvc?view=revision&revision=1299727
Diffstat (limited to 'idl/Module_idl.mk')
| -rw-r--r-- | idl/Module_idl.mk | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/idl/Module_idl.mk b/idl/Module_idl.mk index d6a229787aeb..82b83b03ddfd 100644 --- a/idl/Module_idl.mk +++ b/idl/Module_idl.mk @@ -1,40 +1,26 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* # -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - $(eval $(call gb_Module_Module,idl)) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) - -$(eval $(call gb_Module_add_targets,idl,\ - Executable_svidl \ -)) - +$(eval $(call gb_Module_add_targets,idl,Executable_svidl)) endif # vim: set noet sw=4 ts=4: |