From 29127a0adc7a118be95aa8ce6d59ebc3fabb67de Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 13 Dec 2017 11:44:00 +0100 Subject: [PATCH] change my contributions to Apache-2.0 license @Valodim and @dschuermann asked me to do so, and I said yes. #1683 --- .../keychain/ui/PanicExitActivity.java | 19 +++++++++---------- .../keychain/ui/PanicResponderActivity.java | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicExitActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicExitActivity.java index 3f64bfe25..751256434 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicExitActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicExitActivity.java @@ -1,18 +1,17 @@ /* * Copyright (C) 2015-2016 Hans-Christoph Steiner * - * 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, either version 3 of the License, or - * (at your option) any later version. + * 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 * - * 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 General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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. */ package org.sufficientlysecure.keychain.ui; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicResponderActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicResponderActivity.java index ff7b649f7..490e08729 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicResponderActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicResponderActivity.java @@ -1,18 +1,17 @@ /* * Copyright (C) 2015-2016 Hans-Christoph Steiner * - * 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, either version 3 of the License, or - * (at your option) any later version. + * 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 * - * 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 General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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. */ package org.sufficientlysecure.keychain.ui;