Merge branch 'v4.0-branch'

Bring in the tag, the translations changes and edits preparing for 4.0.2
into master. This should make "git describe" on master create something
reasonably sensible...
This commit is contained in:
Dirk Hohndel 2014-01-10 19:41:37 +07:00
commit ab830b1d4f
26 changed files with 3647 additions and 2748 deletions

View file

@ -6,7 +6,7 @@ INCLUDEPATH += qt-ui $$PWD
mac: TARGET = Subsurface
else: TARGET = subsurface
VERSION = 4.0.1
VERSION = 4.0.2
HEADERS = \
color.h \