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 /jvmfwk/Makefile | |
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 'jvmfwk/Makefile')
-rw-r--r-- | jvmfwk/Makefile | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/jvmfwk/Makefile b/jvmfwk/Makefile index ccb1c85a04da..0997e628485b 100644 --- a/jvmfwk/Makefile +++ b/jvmfwk/Makefile @@ -1,4 +1,11 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) |