Merge branch 'master' into plugins-c

Conflicts:
	src/main.c
	src/ui/console.c
This commit is contained in:
James Booth
2016-02-14 23:00:52 +00:00
100 changed files with 102 additions and 102 deletions

View File

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