devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-20 21:56: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/config/account.c
View File

@@ -1,7 +1,7 @@
/*
* account.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/config/account.h
View File

@@ -1,7 +1,7 @@
/*
* account.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/config/accounts.c
View File

@@ -1,7 +1,7 @@
/*
* accounts.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/config/accounts.h
View File

@@ -1,7 +1,7 @@
/*
* accounts.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/config/conflists.c
View File

@@ -1,7 +1,7 @@
/*
* conflists.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/config/conflists.h
View File

@@ -1,7 +1,7 @@
/*
* conflists.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/config/preferences.c
View File

@@ -1,7 +1,7 @@
/*
* preferences.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/config/preferences.h
View File

@@ -1,7 +1,7 @@
/*
* preferences.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/config/scripts.c
View File

@@ -1,7 +1,7 @@
/*
* scripts.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/config/scripts.h
View File

@@ -1,7 +1,7 @@
/*
* scripts.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/config/theme.c
View File

@@ -1,7 +1,7 @@
/*
* theme.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/config/theme.h
View File

@@ -1,7 +1,7 @@
/*
* theme.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/config/tlscerts.c
View File

@@ -1,7 +1,7 @@
/*
* tlscerts.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/config/tlscerts.h
View File

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