From 300d7399793fce356ae52f0039fe5c55de2ac8f3 Mon Sep 17 00:00:00 2001 From: Adrian Chiris Date: Wed, 13 Jan 2016 19:27:57 +0200 Subject: [PATCH] license modification after portig --- tools_res_mgmt/tools_time.c | 35 +++++++++++++++++++++++++++-------- tools_res_mgmt/tools_time.h | 35 +++++++++++++++++++++++++++-------- 2 files changed, 54 insertions(+), 16 deletions(-) diff --git a/tools_res_mgmt/tools_time.c b/tools_res_mgmt/tools_time.c index 3f53709..2b68d8b 100644 --- a/tools_res_mgmt/tools_time.c +++ b/tools_res_mgmt/tools_time.c @@ -1,14 +1,33 @@ -/* - Mellanox Confidential and Proprietary - +/* + * Copyright (C) Jan 2013 Mellanox Technologies Ltd. All rights reserved. * - * Copyright (C) Jan 2013, Mellanox Technologies Ltd. ALL RIGHTS RESERVED. + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: * - * Except as specifically permitted herein, no portion of the information, - * including but not limited to object code and source code, may be reproduced, - * modified, distributed, republished or otherwise exploited in any form or by - * any means for any purpose without the prior written permission of Mellanox - * Technologies Ltd. Use of software subject to the terms and conditions - * detailed in the file "LICENSE.txt". + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include diff --git a/tools_res_mgmt/tools_time.h b/tools_res_mgmt/tools_time.h index 7f63ea1..1cbcaf7 100644 --- a/tools_res_mgmt/tools_time.h +++ b/tools_res_mgmt/tools_time.h @@ -1,14 +1,33 @@ -/* - Mellanox Confidential and Proprietary - +/* + * Copyright (C) Jan 2013 Mellanox Technologies Ltd. All rights reserved. * - * Copyright (C) Jan 2013, Mellanox Technologies Ltd. ALL RIGHTS RESERVED. + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: * - * Except as specifically permitted herein, no portion of the information, - * including but not limited to object code and source code, may be reproduced, - * modified, distributed, republished or otherwise exploited in any form or by - * any means for any purpose without the prior written permission of Mellanox - * Technologies Ltd. Use of software subject to the terms and conditions - * detailed in the file "LICENSE.txt". + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #ifdef __cplusplus -- 2.46.0