diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-08 08:59:40 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2021-03-08 08:59:40 +0000 |
| commit | 8995d571d8650ce5b3d3a0eb835906b0ffe58462 (patch) | |
| tree | 56683df44a653439760f4c45e632d7218a1fdced | |
| parent | b243f1b2ee19d5a019b0365f31523130ad26c2c5 (diff) | |
| parent | 0792b65863f45a4fe8dcc2d787a4a75e9602d795 (diff) | |
| download | rtmux-8995d571d8650ce5b3d3a0eb835906b0ffe58462.tar.gz rtmux-8995d571d8650ce5b3d3a0eb835906b0ffe58462.tar.bz2 rtmux-8995d571d8650ce5b3d3a0eb835906b0ffe58462.zip | |
Merge branch 'master' into 3.2-rc
| -rw-r--r-- | compat/closefrom.c | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/compat/closefrom.c b/compat/closefrom.c index 0175f364..be008239 100644 --- a/compat/closefrom.c +++ b/compat/closefrom.c @@ -14,8 +14,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "compat.h" - #ifndef HAVE_CLOSEFROM #include <sys/types.h> diff --git a/configure.ac b/configure.ac index 08671c71..4175f5c8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac -AC_INIT([tmux], 3.2-rc4) +AC_INIT([tmux], next-3.3) AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) |