bump version to 1.2.0

synfig · Dec 21, 2016 · 42aa881 · 42aa881
1 parent 87b5593
commit 42aa881
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/ETL/configure.ac b/ETL/configure.ac
@@ -2,7 +2,7 @@
 
 # -- I N I T --------------------------------------------------
 
-AC_INIT([Extended Template Library],[0.04.21],[https://github.com/synfig/synfig/issues],[ETL])
+AC_INIT([Extended Template Library],[0.04.22],[https://github.com/synfig/synfig/issues],[ETL])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)

diff --git a/synfig-core/configure.ac b/synfig-core/configure.ac
@@ -2,7 +2,7 @@
 
 # -- I N I T --------------------------------------------------
 
-AC_INIT([Synfig Core],[1.1.12],[https://github.com/synfig/synfig/issues],[synfig])
+AC_INIT([Synfig Core],[1.2.0],[https://github.com/synfig/synfig/issues],[synfig])
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)

diff --git a/synfig-core/src/synfig/releases.h b/synfig-core/src/synfig/releases.h
@@ -55,6 +55,7 @@ namespace synfig {
 		RELEASE_VERSION_0_64_3,
 		RELEASE_VERSION_1_0,
 		RELEASE_VERSION_1_0_2,
+		RELEASE_VERSION_1_2_0,
 		RELEASE_VERSION_CURRENT,
 		RELEASE_VERSION_END
 	} ReleaseVersion;

diff --git a/synfig-core/src/synfig/version.h b/synfig-core/src/synfig/version.h
@@ -40,14 +40,14 @@
 **	revision release.
 */
 #ifndef SYNFIG_VERSION
-#define SYNFIG_VERSION (010002)
+#define SYNFIG_VERSION (010200)
 #endif
 
 /*!	Increment this value whenever
 **	the library changes in a way
 **	that breaks library compatibility
 */
-#define SYNFIG_LIBRARY_VERSION	49
+#define SYNFIG_LIBRARY_VERSION	50
 
 /*! \writeme */
 #define SYNFIG_CHECK_VERSION()	synfig::check_version_(SYNFIG_LIBRARY_VERSION,sizeof(synfig::Vector),sizeof(synfig::Color),sizeof(synfig::Canvas),sizeof(synfig::Layer))

diff --git a/synfig-studio/configure.ac b/synfig-studio/configure.ac
@@ -2,8 +2,8 @@
 
 # -- I N I T --------------------------------------------------
 
-AC_INIT([Synfig Studio],[1.1.12],[https://github.com/synfig/synfig/issues],[synfigstudio])
-AM_CONDITIONAL(DEVELOPMENT_SNAPSHOT, true)
+AC_INIT([Synfig Studio],[1.2.0],[https://github.com/synfig/synfig/issues],[synfigstudio])
+AM_CONDITIONAL(DEVELOPMENT_SNAPSHOT, false)
 AC_REVISION
 
 AC_CONFIG_AUX_DIR(config)

diff --git a/synfig-studio/src/gui/app.cpp b/synfig-studio/src/gui/app.cpp
@@ -2931,6 +2931,7 @@ App::dialog_save_file(const std::string &title, std::string &filename, std::stri
 		file_type_enum = manage(new Widget_Enum());
 		file_type_enum->set_param_desc(ParamDesc().set_hint("enum")
 				.add_enum_value(synfig::RELEASE_VERSION_CURRENT, "Current", _("Current"))
+				.add_enum_value(synfig::RELEASE_VERSION_1_2_0, "1.2.0", "1.2.0")
 				.add_enum_value(synfig::RELEASE_VERSION_1_0_2, "1.0.2", "1.0.2")
 				.add_enum_value(synfig::RELEASE_VERSION_1_0, "1.0", "1.0")
 				.add_enum_value(synfig::RELEASE_VERSION_0_64_3, "0.64.3", "0.64.3")