diff options
| -rw-r--r-- | AndroidManifest.xml | 15 | ||||
| -rw-r--r-- | doc/LICENSE.txt | 8 | ||||
| -rw-r--r-- | res/layout/basic_settings.xml | 15 |
3 files changed, 6 insertions, 32 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4f2995a0..6c362655 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,19 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 The Android Open Source Project - - 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. ---> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" diff --git a/doc/LICENSE.txt b/doc/LICENSE.txt index 7836430f..0cfdc19d 100644 --- a/doc/LICENSE.txt +++ b/doc/LICENSE.txt @@ -7,8 +7,8 @@ If you need a non GPLv2 license of the source please contact me. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; version 2 -of the License only. +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,3 +19,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +In addition, as a special exception, the copyright holders give +permission to link the code of portions of this program with the +OpenSSL library. + diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml index d8f39a83..76535ce6 100644 --- a/res/layout/basic_settings.xml +++ b/res/layout/basic_settings.xml @@ -1,19 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2011 The Android Open Source Project - - 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. ---> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:blinkt="http://schemas.android.com/apk/res/de.blinkt.openvpn" android:layout_width="wrap_content" |