From 4c9296d286e759dd94633f33a340fe84868397ad Mon Sep 17 00:00:00 2001 From: akwizgran Date: Wed, 2 Jul 2014 22:31:04 +0100 Subject: [PATCH] Merged all licensing info into a single file to avoid APK build problems. --- LICENSE.txt | 17 +++++++++++++++++ briar-android/src/LICENSE.txt | 13 ------------- briar-api/src/LICENSE.txt | 13 ------------- briar-core/src/LICENSE.txt | 13 ------------- briar-desktop/src/LICENSE.txt | 13 ------------- briar-tests/src/LICENSE.txt | 13 ------------- 6 files changed, 17 insertions(+), 65 deletions(-) delete mode 100644 briar-android/src/LICENSE.txt delete mode 100644 briar-api/src/LICENSE.txt delete mode 100644 briar-core/src/LICENSE.txt delete mode 100644 briar-desktop/src/LICENSE.txt delete mode 100644 briar-tests/src/LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt index 3d615ecb5..1b5f2163e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -13,6 +13,23 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . +------------------------------------------------------------------------- + + All files under the directories briar-android/src, briar-api/src, + briar-core/src, briar-desktop/src and briar-test/src are licensed + under the Apache License, version 2.0 (the "License"); you may not + use these files except in compliance with the License. + + You may obtain a copy of the License at + + 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. + ------------------------------------------------------------------------- GNU GENERAL PUBLIC LICENSE diff --git a/briar-android/src/LICENSE.txt b/briar-android/src/LICENSE.txt deleted file mode 100644 index 1c252e7c2..000000000 --- a/briar-android/src/LICENSE.txt +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (C) 2011-2014 Sublime Software Ltd - -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 - -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. diff --git a/briar-api/src/LICENSE.txt b/briar-api/src/LICENSE.txt deleted file mode 100644 index 1c252e7c2..000000000 --- a/briar-api/src/LICENSE.txt +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (C) 2011-2014 Sublime Software Ltd - -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 - -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. diff --git a/briar-core/src/LICENSE.txt b/briar-core/src/LICENSE.txt deleted file mode 100644 index 1c252e7c2..000000000 --- a/briar-core/src/LICENSE.txt +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (C) 2011-2014 Sublime Software Ltd - -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 - -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. diff --git a/briar-desktop/src/LICENSE.txt b/briar-desktop/src/LICENSE.txt deleted file mode 100644 index 1c252e7c2..000000000 --- a/briar-desktop/src/LICENSE.txt +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (C) 2011-2014 Sublime Software Ltd - -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 - -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. diff --git a/briar-tests/src/LICENSE.txt b/briar-tests/src/LICENSE.txt deleted file mode 100644 index 1c252e7c2..000000000 --- a/briar-tests/src/LICENSE.txt +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (C) 2011-2014 Sublime Software Ltd - -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 - -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.