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/otr | |
| 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/otr')
| -rw-r--r-- | src/otr/otr.c | 2 | ||||
| -rw-r--r-- | src/otr/otr.h | 2 | ||||
| -rw-r--r-- | src/otr/otrlib.h | 2 | ||||
| -rw-r--r-- | src/otr/otrlibv3.c | 2 | ||||
| -rw-r--r-- | src/otr/otrlibv4.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/otr/otr.c b/src/otr/otr.c index d898e740..c119e896 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -1,7 +1,7 @@ /* * otr.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/otr/otr.h b/src/otr/otr.h index 284b69b9..a0371952 100644 --- a/src/otr/otr.h +++ b/src/otr/otr.h @@ -1,7 +1,7 @@ /* * otr.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. * diff --git a/src/otr/otrlib.h b/src/otr/otrlib.h index f4b9b804..9fbd0784 100644 --- a/src/otr/otrlib.h +++ b/src/otr/otrlib.h @@ -1,7 +1,7 @@ /* * otrlib.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. * diff --git a/src/otr/otrlibv3.c b/src/otr/otrlibv3.c index f795949d..f522e038 100644 --- a/src/otr/otrlibv3.c +++ b/src/otr/otrlibv3.c @@ -1,7 +1,7 @@ /* * otrlibv3.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/otr/otrlibv4.c b/src/otr/otrlibv4.c index 548d2232..0e8e8986 100644 --- a/src/otr/otrlibv4.c +++ b/src/otr/otrlibv4.c @@ -1,7 +1,7 @@ /* * otrlibv4.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. * |