Merge branch 'master' into 3.2-rc

pull/2648/head
Nicholas Marriott 2021-03-08 08:59:40 +00:00
commit 8995d571d8
2 changed files with 1 additions and 3 deletions

View File

@ -14,8 +14,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#include "compat.h"
#ifndef HAVE_CLOSEFROM #ifndef HAVE_CLOSEFROM
#include <sys/types.h> #include <sys/types.h>

View File

@ -1,6 +1,6 @@
# configure.ac # configure.ac
AC_INIT([tmux], 3.2-rc4) AC_INIT([tmux], next-3.3)
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_CONFIG_AUX_DIR(etc) AC_CONFIG_AUX_DIR(etc)