From 42faf0eb07a1b37becbae5beae29ef5ecf00e746 Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Tue, 8 Apr 2014 11:46:41 +0200
Subject: Update copyright timespan for Thialfihar

---
 OpenKeychain/src/main/res/xml/gen_preferences.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenKeychain/src/main/res/xml/gen_preferences.xml')

diff --git a/OpenKeychain/src/main/res/xml/gen_preferences.xml b/OpenKeychain/src/main/res/xml/gen_preferences.xml
index 9f1883df0..f835f3982 100644
--- a/OpenKeychain/src/main/res/xml/gen_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/gen_preferences.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
+     Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -29,4 +29,4 @@
             android:persistent="false"
             android:title="@string/label_key_servers" />
     </PreferenceCategory>
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
-- 
cgit v1.2.3


From f2d8378d8185fb8c0827c6a44c23da204a2a25ea Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Tue, 8 Apr 2014 11:37:38 +0200
Subject: Change license from ASLv2 to GPLv3 where possible

---
 OpenKeychain/src/main/res/xml/gen_preferences.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'OpenKeychain/src/main/res/xml/gen_preferences.xml')

diff --git a/OpenKeychain/src/main/res/xml/gen_preferences.xml b/OpenKeychain/src/main/res/xml/gen_preferences.xml
index f835f3982..5d7dcd65f 100644
--- a/OpenKeychain/src/main/res/xml/gen_preferences.xml
+++ b/OpenKeychain/src/main/res/xml/gen_preferences.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
+    Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
 
-     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 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.
 
-          http://www.apache.org/licenses/LICENSE-2.0
+    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.
 
-     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.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-- 
cgit v1.2.3