The branch, master has been updated
via 66e8811c64a833b759511b3f7309e834155a8442 (commit)
via a9644c1f8bf28b7c27edca1d8c85275ae6f89509 (commit)
from da72a0b7a8b1f893fd25cfdacef9be7dffa61989 (commit)
- Log -----------------------------------------------------------------
commit 66e8811c64a833b759511b3f7309e834155a8442
Merge: a9644c1 da72a0b
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
grid-view.c | 9 ++-------
server-fn.c | 1 +
tmux.1 | 12 ++++++++++--
3 files changed, 13 insertions(+), 9 deletions(-)
commit a9644c1f8bf28b7c27edca1d8c85275ae6f89509
Author: Nicholas Marriott <[email protected]>
Commit: Nicholas Marriott <[email protected]>
We do not need to add /usr/local to CPPFLAGS; if configure managed to pass
then
the dependencies must already be in the search path. Reported by Romain
Naour.
---
Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 82469e4..071c3a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,12 +36,12 @@ CFLAGS += -Wdeclaration-after-statement
CPPFLAGS += -DDEBUG
endif
if IS_GCC4
-CPPFLAGS += -iquote. -I/usr/local/include
+CPPFLAGS += -iquote.
if IS_DEBUG
CFLAGS += -Wno-pointer-sign
endif
else
-CPPFLAGS += -I. -I- -I/usr/local/include
+CPPFLAGS += -I. -I-
endif
endif
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
