Prepare for release v1.2v1.2

5 files changed, 24 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1b1c3b12..a0f8e0e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,23 @@
+nnn v1.2
+2017-06-29
+
+What's in?
+- Use the desktop opener (xdg-open on Linux, open(1) on OS X) to open files
+- Option `NNN_USE_EDITOR` to open text files in EDITOR (fallback vi)
+- Bookmark support (maximum 10, key `b`)
+- *Navigate-as-you-type* mode (key `Insert` or option `-i`)
+- Subtree search: gnome-search-tool, fallback catfish (key `^/`) (customizable)
+- Show current directory content size and file count in disk usage mode
+- Add detail view mode as default, use `-l` to start in light mode
+- Shortcuts `F2` and `^L` to refresh and unfilter
+  Note: if filter is empty, `Enter` *opens* the currently selected file now
+- Help screen shows bookmarks and configuration
+- Show a message when calculating disk usage
+- Show the spawned shell level
+- Linux only: use vlock as the locker on timeout (set using `NNN_IDLE_TIMEOUT`)
+
+-------------------------------------------------------------------------------
+
 nnn v1.1
 2017-05-12
 
diff --git a/Makefile b/Makefile
index dd562ad9..f1aed0f9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.1
+VERSION = 1.2
 
 PREFIX ?= /usr/local
 MANPREFIX = $(PREFIX)/share/man
diff --git a/Makefile.native b/Makefile.native
index 310f138d..8377972e 100644
--- a/Makefile.native
+++ b/Makefile.native
@@ -1,4 +1,4 @@
-VERSION = 1.1
+VERSION = 1.2
 
 PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
diff --git a/nnn.1 b/nnn.1
index bbd2a445..f55637fa 100644
--- a/nnn.1
+++ b/nnn.1
@@ -1,4 +1,4 @@
-.Dd May 12, 2017
+.Dd Jun 29, 2017
 .Dt NNN 1
 .Os
 .Sh NAME
diff --git a/nnn.c b/nnn.c
index 5587d4b4..6dc78957 100644
--- a/nnn.c
+++ b/nnn.c
@@ -96,7 +96,7 @@ disabledbg()
 #endif /* DEBUGMODE */
 
 /* Macro definitions */
-#define VERSION "v1.1"
+#define VERSION "1.2"
 #define LEN(x) (sizeof(x) / sizeof(*(x)))
 #undef MIN
 #define MIN(x, y) ((x) < (y) ? (x) : (y))