From 5854bb1f502fc73531750afa044cc2b23a97e8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Tue, 10 Sep 2013 21:38:30 +0200 Subject: [PATCH 1/2] Release 1.4.2 --- README.txt | 2 +- openslides/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.txt b/README.txt index 67aaa5c3d..6707e36f0 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ English README file for OpenSlides ==================================== -This is OpenSlides, version 1.4.2 (unreleased). +This is OpenSlides, version 1.4.2 (2013-09-10). What is OpenSlides? diff --git a/openslides/__init__.py b/openslides/__init__.py index a5fb7d9fc..8839755f6 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -1,12 +1,12 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- """ - :copyright: 2011, 2012 by OpenSlides team, see AUTHORS. + :copyright: 2011–2013 by OpenSlides team, see AUTHORS. :license: GNU GPL, see LICENSE for more details. """ VERSION = (1, 4, 2, 'final', 1) # During development it is the next release -RELEASE = False +RELEASE = True def get_version(version=None, release=None): From cd2f01ed26ef28f172420d6c0128d29015117b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Tue, 10 Sep 2013 21:40:44 +0200 Subject: [PATCH 2/2] Update version to 1.4.3-dev --- CHANGELOG | 4 ++++ INSTALL.txt | 2 +- README.txt | 2 +- openslides/__init__.py | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b13c4e075..4371f36ee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,10 @@ http://openslides.org +Version 1.4.3 (unreleased) +========================== + + Version 1.4.2 (2013-09-10) ========================== [https://github.com/OpenSlides/OpenSlides/issues?milestone=12] diff --git a/INSTALL.txt b/INSTALL.txt index 393d436cb..654fbe443 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -1,5 +1,5 @@ ================================================ - Installation instructions for OpenSlides 1.4.2 + Installation instructions for OpenSlides 1.4.3 ================================================ Content diff --git a/README.txt b/README.txt index 6707e36f0..1f51982e8 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ English README file for OpenSlides ==================================== -This is OpenSlides, version 1.4.2 (2013-09-10). +This is OpenSlides, version 1.4.3 (unreleased). What is OpenSlides? diff --git a/openslides/__init__.py b/openslides/__init__.py index 8839755f6..1ec30013e 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -5,8 +5,8 @@ :license: GNU GPL, see LICENSE for more details. """ -VERSION = (1, 4, 2, 'final', 1) # During development it is the next release -RELEASE = True +VERSION = (1, 4, 3, 'final', 1) # During development it is the next release +RELEASE = False def get_version(version=None, release=None):