Merge branch 'master' into readline

Conflicts: src/tools/history.c src/tools/history.h
2015-02-11 00:09:58 +00:00
parent 831be52366 0bf9d324ff
commit b24510c776
86 changed files with 114 additions and 109 deletions
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1,7 +1,7 @@
 /*
 * command.c
 *
- * Copyright (C) 2012 - 2014 James Booth <boothj5@gmail.com>
+ * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
 *
 * This file is part of Profanity.
 *
--- a/src/command/command.h
+++ b/src/command/command.h
@@ -1,7 +1,7 @@
 /*
 * command.h
 *
- * Copyright (C) 2012 - 2014 James Booth <boothj5@gmail.com>
+ * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
 *
 * This file is part of Profanity.
 *
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -1,7 +1,7 @@
 /*
 * commands.c
 *
- * Copyright (C) 2012 - 2014 James Booth <boothj5@gmail.com>
+ * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
 *
 * This file is part of Profanity.
 *
--- a/src/command/commands.h
+++ b/src/command/commands.h
@@ -1,7 +1,7 @@
 /*
 * commands.h
 *
- * Copyright (C) 2012 - 2014 James Booth <boothj5@gmail.com>
+ * Copyright (C) 2012 - 2015 James Booth <boothj5@gmail.com>
 *
 * This file is part of Profanity.
 *