diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 14:07:46 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 14:07:46 +0100 |
commit | 9509cfbb986ba8d28e1031b3600d07ff3014eea3 (patch) | |
tree | f8c44cc70bd0de6908ad98f9335d9d667aaffa9a /src/org/openintents/openpgp/util/OpenPgpApi.java | |
parent | c940f440e3d2e617448bc97a4397104711e19bbe (diff) | |
parent | c15a7e126afd296dd00cbd909029070a25ee76f6 (diff) | |
download | openpgp-api-9509cfbb986ba8d28e1031b3600d07ff3014eea3.tar.gz openpgp-api-9509cfbb986ba8d28e1031b3600d07ff3014eea3.tar.bz2 openpgp-api-9509cfbb986ba8d28e1031b3600d07ff3014eea3.zip |
Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib
Diffstat (limited to 'src/org/openintents/openpgp/util/OpenPgpApi.java')
-rw-r--r-- | src/org/openintents/openpgp/util/OpenPgpApi.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/openintents/openpgp/util/OpenPgpApi.java b/src/org/openintents/openpgp/util/OpenPgpApi.java index cd916a9..589b514 100644 --- a/src/org/openintents/openpgp/util/OpenPgpApi.java +++ b/src/org/openintents/openpgp/util/OpenPgpApi.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de> + * Copyright (C) 2014-2015 Dominik Schürmann <dominik@dominikschuermann.de> * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. |