Merge branch 'master' into 3.2-rc

2021-03-08 08:59:40 +00:00 · 2021-03-08 08:59:40 +00:00 · 8995d571d8
parent b243f1b2ee 0792b65863
commit 8995d571d8
2 changed files with 1 additions and 3 deletions
--- 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>
--- 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)