From 16bf299b3b9011d151a598ee06e02e6a96f2249d Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 10 Dec 2014 15:22:01 -0500 Subject: [PATCH 1/2] Version bump for the release --- Documentation/docinfo.xml | 4 ++-- Documentation/includes/global-attributes.asciidoc | 2 +- Version | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/docinfo.xml b/Documentation/docinfo.xml index f3d35a35c..6b2307a19 100644 --- a/Documentation/docinfo.xml +++ b/Documentation/docinfo.xml @@ -1,7 +1,7 @@ Version 2.2.11 - December 2014 -for version 2.2.11 -2014-12-09 +for version 2.2.11a +2014-12-10 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License". diff --git a/Documentation/includes/global-attributes.asciidoc b/Documentation/includes/global-attributes.asciidoc index 96aebb5da..b6fb5b222 100644 --- a/Documentation/includes/global-attributes.asciidoc +++ b/Documentation/includes/global-attributes.asciidoc @@ -13,6 +13,6 @@ // TODO have the build system take care of this -:release_version: 2.2.11 +:release_version: 2.2.11a // vim: set syntax=asciidoc tabstop=2 shiftwidth=2 expandtab: diff --git a/Version b/Version index 7df880e8e..dac0ef8e6 100644 --- a/Version +++ b/Version @@ -4,4 +4,4 @@ MAJOR_VERSION=2 MINOR_VERSION=2 -SUBMINOR_VERSION=11 +SUBMINOR_VERSION=11a From c8b74686cc0c656b2a0330c28d299a793417035e Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 10 Dec 2014 15:22:32 -0500 Subject: [PATCH 2/2] Update ChangeLog --- ChangeLog | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index a78b6b1f2..35fe46f96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +commit 16bf299b3b9011d151a598ee06e02e6a96f2249d +Author: Ludovic Marcotte +Date: Wed Dec 10 15:22:01 2014 -0500 + + Version bump for the release + +M Documentation/docinfo.xml +M Documentation/includes/global-attributes.asciidoc +M Version + +commit b8c79664e102abb36ec6e2b978fb7825c0f1841c +Author: Ludovic Marcotte +Date: Wed Dec 10 14:24:51 2014 -0500 + + Update ChangeLog + +M ChangeLog + commit 3c063e04fb6943a5716e3978e49e9dcef3660b77 Author: Ludovic Marcotte Date: Wed Dec 10 14:24:06 2014 -0500