diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-04-01 09:30:12 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-04-01 09:30:12 +0100 |
| commit | 1d4cdbc2277953603352dce766c77f8bae4d621c (patch) | |
| tree | 1b4bba9485ef16f7824e5c7f051da9265fe0e85c | |
| parent | b8356c650a0d9ca455ed381777828308756b32d0 (diff) | |
| parent | e5fd85415d89ebe8b2f69c80ce6cf80fb1442fde (diff) | |
| download | rtmux-1d4cdbc2277953603352dce766c77f8bae4d621c.tar.gz rtmux-1d4cdbc2277953603352dce766c77f8bae4d621c.tar.bz2 rtmux-1d4cdbc2277953603352dce766c77f8bae4d621c.zip | |
Merge branch '3.1-rc'
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 6 insertions, 0 deletions
@@ -45,6 +45,8 @@ CHANGES FROM 3.0a TO 3.1 search-backward use regular expressions by default; the incremental versions do not. +* Turn off mouse mode 1003 as well as the rest when exiting. + * Add selection_active format for when the selection is present but not moving with the cursor. diff --git a/configure.ac b/configure.ac index e29ebdc7..a835e104 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,10 @@ # configure.ac +<<<<<<< HEAD AC_INIT([tmux], next-3.2) +======= +AC_INIT([tmux], 3.1-rc3) +>>>>>>> 3.1-rc AC_PREREQ([2.60]) AC_CONFIG_AUX_DIR(etc) |