From 0bbf4dbf4f1de0c5dfe41b3784508f72819263f8 Mon Sep 17 00:00:00 2001 From: Greg Albrecht <gba@onbeep.com> Date: Mon, 16 Sep 2013 18:17:49 -0700 Subject: [PATCH] lic & copy update --- COPYRIGHT.txt | 4 +--- LICENSE | 37 ++++++++++--------------------------- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 4582cc3..432e693 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -1,3 +1 @@ -1. Original components are Copyright 2013 OnBeep, Inc. - -2. Components derived from dixprs are Copyright 2013 Bela Markus. +Copyright 2013, OnBeep, Inc. diff --git a/LICENSE b/LICENSE index 0777fc8..353e988 100644 --- a/LICENSE +++ b/LICENSE @@ -1,30 +1,13 @@ -1. Original components are covered under Apache License 2.0: +Copyright 2013 OnBeep, Inc. - Copyright 2013 OnBeep, Inc. +Licensed 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 - Licensed 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 - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -2. Components derived from dixprs are covered by the following license: - - You are allowed to: - - - Use DIXPRS free for HAM radio. - - Redistribute DIXPRS for HAM radio purposes in original format - (archive files available in download section). - - Modify it for yourself. - - Redistribute modified version for HAM radio use as long as you keep - original copyright text in files with the original licence conditions. - - Commercial use or changing above rules is not allowed without prior written - approval of author, HA5DI. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. -- GitLab