devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-19 12:36:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into plugins-c

Browse Source 
Conflicts:
	src/main.c
	src/ui/console.c
This commit is contained in:
James Booth
2016-02-14 23:00:52 +00:00
parent 41fe8c22b1 e53e94f1e2
commit 1f90aca503
100 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/buffer.c
View File

@@ -1,7 +1,7 @@
/*
* buffer.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.
*

2
src/ui/buffer.h
View File

@@ -1,7 +1,7 @@
/*
* buffer.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.
*

2
src/ui/chatwin.c
View File

@@ -1,7 +1,7 @@
/*
* chatwin.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.
*

4
src/ui/console.c
View File

@@ -1,7 +1,7 @@
/*
* console.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.
*
@@ -427,7 +427,7 @@ cons_about(void)
}
}
win_vprint(console, '-', 0, NULL, 0, 0, "", "Copyright (C) 2012 - 2015 James Booth <%s>.", PROF_PACKAGE_BUGREPORT);
win_vprint(console, '-', 0, NULL, 0, 0, "", "Copyright (C) 2012 - 2016 James Booth <%s>.", PROF_PACKAGE_BUGREPORT);
win_println(console, 0, "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>");
win_println(console, 0, "");
win_println(console, 0, "This is free software; you are free to change and redistribute it.");

2
src/ui/core.c
View File

@@ -1,7 +1,7 @@
/*
* core.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.
*

2
src/ui/inputwin.c
View File

@@ -1,7 +1,7 @@
/*
* inputwin.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.
*

2
src/ui/inputwin.h
View File

@@ -1,7 +1,7 @@
/*
* inputwin.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.
*

2
src/ui/mucconfwin.c
View File

@@ -1,7 +1,7 @@
/*
* mucconfwin.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.
*

2
src/ui/mucwin.c
View File

@@ -1,7 +1,7 @@
/*
* mucwin.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.
*

2
src/ui/notifier.c
View File

@@ -1,7 +1,7 @@
/*
* notifier.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.
*

2
src/ui/occupantswin.c
View File

@@ -1,7 +1,7 @@
/*
* occupantswin.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.
*

2
src/ui/privwin.c
View File

@@ -1,7 +1,7 @@
/*
* privwin.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.
*

2
src/ui/rosterwin.c
View File

@@ -1,7 +1,7 @@
/*
* rosterwin.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.
*

2
src/ui/statusbar.c
View File

@@ -1,7 +1,7 @@
/*
* statusbar.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.
*

2
src/ui/statusbar.h
View File

@@ -1,7 +1,7 @@
/*
* statusbar.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.
*

2
src/ui/titlebar.c
View File

@@ -1,7 +1,7 @@
/*
* titlebar.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.
*

2
src/ui/titlebar.h
View File

@@ -1,7 +1,7 @@
/*
* titlebar.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.
*

2
src/ui/ui.h
View File

@@ -1,7 +1,7 @@
/*
* ui.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.
*

2
src/ui/win_types.h
View File

@@ -1,7 +1,7 @@
/*
* win_types.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.
*

2
src/ui/window.c
View File

@@ -1,7 +1,7 @@
/*
* window.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.
*

2
src/ui/window.h
View File

@@ -1,7 +1,7 @@
/*
* window.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.
*

2
src/ui/xmlwin.c
View File

@@ -1,7 +1,7 @@
/*
* xmlwin.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.
*