diff options
author | Lassi Marttala <lassi.lm.marttala@partner.bmw.com> | 2012-03-26 11:19:42 +0200 |
---|---|---|
committer | Lassi Marttala <lassi.lm.marttala@partner.bmw.com> | 2012-03-26 11:19:42 +0200 |
commit | 3802aa9eb4cdcea90ce14a10752dd96f4ada799b (patch) | |
tree | 1e70508d56b6ca27005e897aced0fc2336cc4756 /include/dlt/dlt_offline_trace.h | |
parent | 51910724642d1f3e852a76ada0a91a6a9d380ce9 (diff) | |
download | DLT-daemon-3802aa9eb4cdcea90ce14a10752dd96f4ada799b.tar.gz |
GDLT-38, Update licenses in include
Diffstat (limited to 'include/dlt/dlt_offline_trace.h')
-rw-r--r-- | include/dlt/dlt_offline_trace.h | 51 |
1 files changed, 18 insertions, 33 deletions
diff --git a/include/dlt/dlt_offline_trace.h b/include/dlt/dlt_offline_trace.h index 04c4f1a..dd5bea6 100644 --- a/include/dlt/dlt_offline_trace.h +++ b/include/dlt/dlt_offline_trace.h @@ -1,39 +1,24 @@ -/* -* Dlt- Diagnostic Log and Trace user library -* @licence app begin@ +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. * - * Copyright (C) 2011, BMW AG - Alexander Wenzel <alexander.wenzel@bmw.de> - * - * This program is free software; you can redistribute it and/or modify it under the terms of the - * GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation. - * This program 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 2.1, for more details. - * - * You should have received a copy of the GNU Lesser General Public License, version 2.1, along - * with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>. - * - * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may - * also be applicable to programs even in cases in which the program is not a library in the technical sense. - * - * Linking DLT statically or dynamically with other modules is making a combined work based on DLT. You may - * license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to - * license your linked modules under the GNU Lesser General Public License, version 2.1, you - * may use the program under the following exception. - * - * As a special exception, the copyright holders of DLT give you permission to combine DLT - * with software programs or libraries that are released under any license unless such a combination is not - * permitted by the license of such a software program or library. You may copy and distribute such a - * system following the terms of the GNU Lesser General Public License, version 2.1, including this - * special exception, for DLT and the licenses of the other code concerned. - * - * Note that people who make modified versions of DLT are not obligated to grant this special exception - * for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, - * version 2.1, gives permission to release a modified version without this exception; this exception - * also makes it possible to release a modified version which carries forward this exception. + * \copyright + * 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/. * + * + * \author Alexander Wenzel <alexander.wenzel@bmw.de> BMW 2011-2012 + * + * \file <FILE> + * For further information see http://www.genivi.org/. * @licence end@ -*/ + */ /******************************************************************************* |