Merge branch 'master' into plugins-c

Conflicts: src/main.c src/ui/console.c
2016-02-14 23:00:52 +00:00
parent 41fe8c22b1 e53e94f1e2
commit 1f90aca503
100 changed files with 102 additions and 102 deletions
--- a/src/ui/buffer.c
+++ b/src/ui/buffer.c
@@ -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.
 *