Merge remote-tracking branch 'tmux/master'

This commit is contained in:
Nicolas Viennot
2016-03-11 13:26:22 -05:00
141 changed files with 975 additions and 1426 deletions

View File

@ -2,7 +2,7 @@
/*
* Copyright (c) 2011 George Nachman <tmux@georgester.com>
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above