diff options
| author | James Booth <boothj5@gmail.com> | 2016-02-14 23:00:52 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2016-02-14 23:00:52 +0000 |
| commit | 1f90aca503ed8a2c47aea55496b8ae8656b1e416 (patch) | |
| tree | 0baa62fa05a7e775143607ca0b35deba34b5cd57 /src/pgp | |
| parent | 41fe8c22b1f8c1cf666d42052cd73d59e40a2ed2 (diff) | |
| parent | e53e94f1e2c357302c25be58834158a2dbb55652 (diff) | |
| download | profani-tty-1f90aca503ed8a2c47aea55496b8ae8656b1e416.tar.gz | |
Merge branch 'master' into plugins-c
Conflicts: src/main.c src/ui/console.c
Diffstat (limited to 'src/pgp')
| -rw-r--r-- | src/pgp/gpg.c | 2 | ||||
| -rw-r--r-- | src/pgp/gpg.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/pgp/gpg.c b/src/pgp/gpg.c index 64941f17..b04839c3 100644 --- a/src/pgp/gpg.c +++ b/src/pgp/gpg.c @@ -1,7 +1,7 @@ /* * gpg.c * - * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com> + * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com> * * This file is part of Profanity. * diff --git a/src/pgp/gpg.h b/src/pgp/gpg.h index 5149343f..a603dd56 100644 --- a/src/pgp/gpg.h +++ b/src/pgp/gpg.h @@ -1,7 +1,7 @@ /* * gpg.h * - * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com> + * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com> * * This file is part of Profanity. * |