From aef3f73c7d7b23b5fafa98605aec3c429a1c1949 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Wed, 28 Jun 2017 08:43:27 +0000
Subject: made 3.6.0 release.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3565 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog              | 4 ++++
 INSTALL                | 2 +-
 INSTALL.ja             | 2 +-
 NEWS                   | 4 ++++
 configure.ac           | 6 +++---
 nsis/sylpheed-defs.nsh | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 12dd2aeb..3e4e5d55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-28
+
+	* version 3.6.0
+
 2017-06-28
 
 	* manual/ja/sylpheed.sgml: updated.
diff --git a/INSTALL b/INSTALL
index 63bd6c0c..9e0ce862 100644
--- a/INSTALL
+++ b/INSTALL
@@ -112,7 +112,7 @@ o Mac OS X 10.9.2 (Marvericks)
 
 Windows
 
-o Windows Vista / 7 / 8 / 10 (MinGW 32bit)
+o Windows 7 / 8 / 10 (MinGW 32bit)
 
 Build it
 ========
diff --git a/INSTALL.ja b/INSTALL.ja
index 228f062c..750e919e 100644
--- a/INSTALL.ja
+++ b/INSTALL.ja
@@ -112,7 +112,7 @@ o Mac OS X 10.9.2 (Marvericks)
 
 Windows
 
-o Windows Vista / 7 / 8 / 10 (MinGW 32bit)
+o Windows 7 / 8 / 10 (MinGW 32bit)
 
 ¥Ó¥ë¥É
 ======
diff --git a/NEWS b/NEWS
index 28f85e3e..f2123c1c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 Changes of Sylpheed
 
+* 3.6.0 (stable)
+
+    * The Japanese manual was updated.
+
 * 3.6.0beta1 (development)
 
     * The feature to use multiple signatures in one account was added.
diff --git a/configure.ac b/configure.ac
index 6dfd03e0..e1798902 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,12 +9,12 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=beta1
-BUILD_REVISION=1177
+EXTRA_VERSION=
+BUILD_REVISION=1178
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl define if this is a development release
-DEVEL_VERSION=1
+dnl DEVEL_VERSION=1
 
 dnl set $target
 AC_CANONICAL_SYSTEM
diff --git a/nsis/sylpheed-defs.nsh b/nsis/sylpheed-defs.nsh
index fec273d9..63ee1ca7 100644
--- a/nsis/sylpheed-defs.nsh
+++ b/nsis/sylpheed-defs.nsh
@@ -2,7 +2,7 @@
 ;!define HAVE_AUTOENC_PLUGIN
 
 !define PRODUCT_NAME "Sylpheed"
-!define PRODUCT_VERSION "3.6beta1"
+!define PRODUCT_VERSION "3.6"
 
 !ifdef SYLPHEED_PRO
 !define PRODUCT_PUBLISHER "SRA OSS, Inc. Japan"
-- 
cgit v1.2.3