The branch, master has been updated
via 77f582ff137808cc3743ad545f63422cc8e71a71 (commit)
via f5973b77763e3f8da8e8f6483464f6f4bc2f3981 (commit)
from 92af7f5901bd944e385e7fdbe8696b2c911ed776 (commit)
- Log -----------------------------------------------------------------
commit 77f582ff137808cc3743ad545f63422cc8e71a71
Merge: f5973b7 92af7f5
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
cmd-capture-pane.c | 25 ++---
cmd-choose-buffer.c | 9 +-
cmd-delete-buffer.c | 15 +--
cmd-find-window.c | 2 +
cmd-list-buffers.c | 6 +-
cmd-load-buffer.c | 57 +++------
cmd-new-session.c | 34 ++++--
cmd-new-window.c | 24 +++-
cmd-paste-buffer.c | 29 ++---
cmd-respawn-pane.c | 13 +--
cmd-respawn-window.c | 12 +--
cmd-save-buffer.c | 18 +--
cmd-set-buffer.c | 67 +++++++----
cmd-split-window.c | 25 +++--
cmd.c | 30 +++++-
format.c | 9 +-
input-keys.c | 15 +++
layout.c | 1 -
log.c | 1 +
mode-key.c | 2 +
names.c | 12 ++-
paste.c | 202 ++++++++++++++++++++++++-------
session.c | 18 ++--
style.c | 8 +-
tmux.1 | 93 +++++++++++----
tmux.h | 55 ++++++---
tty-keys.c | 6 +-
window-choose.c | 19 ++-
window-copy.c | 86 +++++++-------
window.c | 327 +++++++++++++++++++++++++++----------------------
30 files changed, 741 insertions(+), 479 deletions(-)
commit f5973b77763e3f8da8e8f6483464f6f4bc2f3981
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Build DEBUG with -O2 as well.
---
Makefile.am | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5502de8..5f9e011 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,17 +25,15 @@ endif
# Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
# different flags.
if IS_GCC
-CFLAGS += -std=gnu99
+CFLAGS += -std=gnu99 -O2
if IS_DEBUG
-CFLAGS += -O0 -g
+CFLAGS += -g
CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
CFLAGS += -Wundef -Wbad-function-cast -Winline -Wcast-align
CFLAGS += -Wdeclaration-after-statement
CPPFLAGS += -DDEBUG
-else
-CFLAGS += -O2
endif
if IS_GCC4
CPPFLAGS += -iquote. -I/usr/local/include
@@ -247,7 +245,7 @@ install-exec-hook:
>$(srcdir)/tmux.1.mdoc; \
else \
sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
- $(AWK) -f $(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man;
\
+ $(AWK) -f$(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
fi
$(MKDIR_P) $(DESTDIR)$(mandir)/man1
$(INSTALL_DATA) $(srcdir)/tmux.1.@MANFORMAT@ \
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
