The branch, master has been updated
via f4196138cefe01df9aed085a7534dc30f45999e8 (commit)
via fe1aa9299eb84e89dc5009997b46e0c3bc000e45 (commit)
via bafe6f5a7c8b09a62ac2ab2444aa04fb5736c8a5 (commit)
from be6dc83277c49c8f7db30cc363134463af0aa596 (commit)
- Log -----------------------------------------------------------------
commit f4196138cefe01df9aed085a7534dc30f45999e8
Merge: fe1aa92 be6dc83
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Makefile.am | 1 -
cmd-clock-mode.c | 49 -------------------------------------------------
cmd-copy-mode.c | 15 ++++++++++++++-
cmd-queue.c | 5 ++++-
colour.c | 16 ++++++++--------
status.c | 8 ++++----
window.c | 2 +-
7 files changed, 31 insertions(+), 65 deletions(-)
commit fe1aa9299eb84e89dc5009997b46e0c3bc000e45
Merge: b4750e4 bafe6f5
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Merge branch 'tmp'
commit bafe6f5a7c8b09a62ac2ab2444aa04fb5736c8a5
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Remove LocalWords.
---
CHANGES | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/CHANGES b/CHANGES
index 17d4d2a..6cec717 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1856,8 +1856,3 @@ The list of older changes is below.
customisation.
$Id$
-
- LocalWords: showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
- LocalWords: rivo nurges lscm Erdely eol smysession mysession ek dstname RB ms
- LocalWords: dstidx srcname srcidx winlink lsw nabc sabc Exp Tiago Cunha dch
- LocalWords: setw Chisnall renamew merdely eg Maier newname selectw neww Gass
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
