Kaydet (Commit) d6dfedf4 authored tarafından Colomban Wendling's avatar Colomban Wendling

Post-release version bump

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5989 ea778897-0a13-0410-b9d1-a72fbfd435f5
üst 5b220d70
2011-10-03 Colomban Wendling <colomban(at)geany(dot)org>
* TODO, configure.ac, doc/geany.txt, geany.nsi, geany_private.rc,
src/geany.h, win32-config.h, wscript:
Post-release version bump.
2011-10-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> 2011-10-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* Merge branches/unstable: * Merge branches/unstable:
......
...@@ -27,9 +27,9 @@ Note: features included in brackets have lower priority. ...@@ -27,9 +27,9 @@ Note: features included in brackets have lower priority.
workspace-sockets branch) workspace-sockets branch)
1.0: Someday:
o stable plugin ABI for the 1.0 series? (Split up geany_data, prefs, o stable plugin ABI? (Split up geany_data, prefs, GeanyKeyCommand
GeanyKeyCommand enum into groups) enum into groups)
o review documentation o review documentation
......
...@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. ...@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl $Id$ dnl $Id$
AC_INIT(configure.ac) AC_INIT(configure.ac)
AM_INIT_AUTOMAKE(geany, 0.21) AM_INIT_AUTOMAKE(geany, 1.22)
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
......
.. |(version)| replace:: 0.21 .. |(version)| replace:: 1.22
======= =======
Geany Geany
......
...@@ -33,8 +33,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista ...@@ -33,8 +33,8 @@ RequestExecutionLevel highest ; set execution level for Windows Vista
; helper defines ; ; helper defines ;
;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;
!define PRODUCT_NAME "Geany" !define PRODUCT_NAME "Geany"
!define PRODUCT_VERSION "0.21" !define PRODUCT_VERSION "1.22"
!define PRODUCT_VERSION_ID "0.21.0.0" !define PRODUCT_VERSION_ID "1.22.0.0"
!define PRODUCT_PUBLISHER "The Geany developer team" !define PRODUCT_PUBLISHER "The Geany developer team"
!define PRODUCT_WEB_SITE "http://www.geany.org/" !define PRODUCT_WEB_SITE "http://www.geany.org/"
!define PRODUCT_DIR_REGKEY "Software\Geany" !define PRODUCT_DIR_REGKEY "Software\Geany"
......
#include <windows.h> // include for version info constants #include <windows.h> // include for version info constants
#define VER_FILEVERSION 0,21,0,0 #define VER_FILEVERSION 1,22,0,0
#define VER_FILEVERSION_STR "0.21" #define VER_FILEVERSION_STR "1.22"
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico" A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../icons/geany.ico"
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
* listed in the documentation should not be changed */ * listed in the documentation should not be changed */
#define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_FILEDEFS_SUBDIR "filedefs"
#define GEANY_TEMPLATES_SUBDIR "templates" #define GEANY_TEMPLATES_SUBDIR "templates"
#define GEANY_CODENAME "Gromia" #define GEANY_CODENAME "Tavira"
#define GEANY_HOMEPAGE "http://www.geany.org/" #define GEANY_HOMEPAGE "http://www.geany.org/"
#define GEANY_STRING_UNTITLED _("untitled") #define GEANY_STRING_UNTITLED _("untitled")
#define GEANY_DEFAULT_DIALOG_HEIGHT 350 #define GEANY_DEFAULT_DIALOG_HEIGHT 350
......
...@@ -314,7 +314,7 @@ ...@@ -314,7 +314,7 @@
/* #undef volatile */ /* #undef volatile */
/* Version number of package */ /* Version number of package */
#define VERSION "0.21" #define VERSION "1.22"
#define REVISION "-1" #define REVISION "-1"
......
...@@ -52,7 +52,7 @@ from waflib.TaskGen import feature ...@@ -52,7 +52,7 @@ from waflib.TaskGen import feature
APPNAME = 'geany' APPNAME = 'geany'
VERSION = '0.21' VERSION = '1.22'
LINGUAS_FILE = 'po/LINGUAS' LINGUAS_FILE = 'po/LINGUAS'
top = '.' top = '.'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment