Merge branch 'master' into readline

Conflicts:
	src/tools/history.c
	src/tools/history.h
This commit is contained in:
James Booth
2015-02-11 00:09:58 +00:00
86 changed files with 114 additions and 109 deletions

View File

@@ -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.
*