From 5fd32d8fbd9fb04ab5509a8eb879b5ee81babb3f Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 30 Jan 2012 14:59:08 +0000 Subject: [PATCH] Release 1.2.2 - Merged changes from V_1_2_1_7_NEUHAUS --- CHANGES | 12 ++++++++---- VERSION | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 72d2e046..f15e3eae 100644 --- a/CHANGES +++ b/CHANGES @@ -398,10 +398,14 @@ Version 1.1.31.0 ---------------- o YAbstractFamilyMember: added support for garbage collector -1.2.0-0 -------- +Version 1.2.0-0 +--------------- o merged changes from V_1_1_31_6_POST_ACCEPTANCE -1.2.1-0 -------- +Version 1.2.1-0 +--------------- o merged changes from V_1_2_0_35_NEUHAUS + +Version 1.2.2 +------------- +o merged changes from V_1_2_1_7_NEUHAUS diff --git a/VERSION b/VERSION index a94cace1..2ffde7b5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.1-8-dev +1.2.2-0-dev