The branch, master has been updated
via 2ee9c4df12429d4f6fb8f06a373fdd5c0347049c (commit)
via e6c77e7afbcee07ed6237f2a0f30e70f45ecf0ba (commit)
from 76cb088d16fd5aa47b54428368ef403cbbcf4f5a (commit)
- Log -----------------------------------------------------------------
commit 2ee9c4df12429d4f6fb8f06a373fdd5c0347049c
Merge: e6c77e7 76cb088
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
.gitignore | 1 +
Makefile.am | 22 +++-
TODO | 3 +-
client.c | 4 +-
clock.c | 15 ++-
cmd-choose-tree.c | 10 +-
cmd-copy-mode.c | 8 +-
cmd-queue.c | 2 +-
cmd-source-file.c | 1 +
cmd-swap-pane.c | 8 +-
cmd.c | 4 +-
colour.c | 26 ----
compat.h | 5 +
compat/cfmakeraw.c | 32 +++++
configure.ac | 16 +++
examples/tmux.vim | 2 +-
format.c | 6 +-
input-keys.c | 2 +-
job.c | 6 +-
mdoc2man.awk | 370 ++++++++++++++++++++++++++++++++++++++++++++++++++++
options-table.c | 2 +-
screen-write.c | 6 +-
screen.c | 8 +-
server-client.c | 22 +---
server-fn.c | 1 +
server.c | 8 +-
tmux.1 | 24 ++--
tmux.c | 20 ++--
tmux.h | 13 +-
tty-term.c | 4 +-
tty.c | 36 +-----
utf8.c | 1 -
window-choose.c | 14 ++-
33 files changed, 555 insertions(+), 147 deletions(-)
commit e6c77e7afbcee07ed6237f2a0f30e70f45ecf0ba
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Add a COPYING file, suggested by Dagobert Michelsen.
---
COPYING | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..9d96b3e
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,21 @@
+THIS IS FOR INFORMATION ONLY, CODE IS UNDER THE LICENCE AT THE TOP OF ITS FILE.
+
+The README, CHANGES, FAQ and TODO files are licensed under the ISC
+license. Files under examples/ remain copyright their authors unless otherwise
+stated in the file but permission has been received to distribute them with
+tmux. All other files have a license and copyright notice at their start,
+typically:
+
+Copyright (c) <author>
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-----------------------------------------------------------------------
Summary of changes:
COPYING | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
create mode 100644 COPYING
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite
It's a free troubleshooting tool designed for production
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap2
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
