devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-21 05: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

4
src/main.c
View File

@@ -1,7 +1,7 @@
/*
* main.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.
*
@@ -90,7 +90,7 @@ main(int argc, char **argv)
g_print("Profanity, version %s\n", PROF_PACKAGE_VERSION);
}
g_print("Copyright (C) 2012 - 2015 James Booth <%s>.\n", PROF_PACKAGE_BUGREPORT);
g_print("Copyright (C) 2012 - 2016 James Booth <%s>.\n", PROF_PACKAGE_BUGREPORT);
g_print("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n");
g_print("\n");
g_print("This is free software; you are free to change and redistribute it.\n");