summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Fonseca <jonas.fonseca@gmail.com>2016-08-10 22:38:25 -0400
committerJonas Fonseca <jonas.fonseca@gmail.com>2016-08-10 22:38:25 -0400
commitbba76f5141aaad75bde15dadc8a0f258fda86fe0 (patch)
tree97ea5e89d043f41ab8068641018dda394300050e
parentfc35eccdc0e09987fd7be7a1aa7214435684ae7e (diff)
tig-2.2tig-2.2
-rw-r--r--Makefile2
-rw-r--r--NEWS.adoc4
-rw-r--r--tools/aspell.dict14
3 files changed, 15 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c3763dea..918cbf17 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# The last tagged version. Can be overridden either by the version from
# git or from the value of the DIST_VERSION environment variable.
-VERSION = 2.1.1
+VERSION = 2.2
all:
diff --git a/NEWS.adoc b/NEWS.adoc
index 1310bf63..8f3bb0fc 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -1,8 +1,8 @@
Release notes
=============
-master
-------
+tig-2.2
+-------
Incompatibilities:
diff --git a/tools/aspell.dict b/tools/aspell.dict
index faee9e2d..1383cf3e 100644
--- a/tools/aspell.dict
+++ b/tools/aspell.dict
@@ -1,6 +1,7 @@
-personal_ws-1.1 en 249
+personal_ws-1.1 en 259
CJK
del
+goto
Ctrl
refspec
Shorthands
@@ -41,6 +42,7 @@ alloc
committer
cdate
SHAs
+committers
contrib
xclip
eol
@@ -52,12 +54,14 @@ backend
Esc
doctype
abspath
+shortlog
gitlink
colorN
nowarn
sys
subshell
tty
+XDG
cmdlineargs
combi
Petr
@@ -102,6 +106,7 @@ gui
bindir
tigmanual
PgUp
+mailmap
SunStudio
wrt
libiconv
@@ -142,6 +147,7 @@ Online
qgit
PageDown
gc
+ZSH
Solaris
GH
mergetool
@@ -197,14 +203,15 @@ Baudis
substring
PID
tz
-DocBook
docbook
+DocBook
submodule
strndup
startup
Yi
docext
renderer
+strftime
textconv
strchr
lineno
@@ -225,6 +232,7 @@ lncursesw
Geany
waitpid
wgetch
+OSX
Pre
backgrounded
waddch
@@ -235,7 +243,9 @@ ACDMRTXB
getch
struct
untracked
+commit's
autoreconf
+ScrBack
subcommands
adate
PageUp