aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-08-12 20:30:34 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-08-12 20:30:34 +0200
commit2edb5349b065b2e5bbae80a7b09c96afa664fc04 (patch)
tree64e6d7b758d967f43f12e4e89d7772c435b5b0b9 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base
parentd14e0b2ed383cc5d6c30a51f334ab0242cd3f56e (diff)
downloadopen-keychain-2edb5349b065b2e5bbae80a7b09c96afa664fc04.tar.gz
open-keychain-2edb5349b065b2e5bbae80a7b09c96afa664fc04.tar.bz2
open-keychain-2edb5349b065b2e5bbae80a7b09c96afa664fc04.zip
Change license of NfcOperationActivity and fix copyright in BaseNfcActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
index c472eaa4c..972421abe 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
@@ -1,6 +1,8 @@
/*
* Copyright (C) 2015 Dominik Schürmann <dominik@dominikschuermann.de>
* Copyright (C) 2015 Vincent Breitmoser <v.breitmoser@mugenguild.com>
+ * Copyright (C) 2013-2014 Signe Rüsch
+ * Copyright (C) 2013-2014 Philipp Jakubeit
*
* 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