Merge branch 'release-2.2.0' into develop

2015-12-03 06:12:25 +01:00 · 2015-12-03 06:12:25 +01:00 · d1fa0b797d
commit d1fa0b797d
parent 1314cb0e4b 7e79256ffd
4 changed files with 15 additions and 5 deletions
--- a/HISTORY.md
+++ b/HISTORY.md
@ -1,3 +1,13 @@
+Version 2.2.0 (2015-12-03)
+========================================================================
+
+- NEU: Funktion zum Formatieren der Medikationsliste.
+- VERBESSERT: Kohlehydratdefizientes Transferrin hinzugefügt (als 'CDT') und Ambulanzstil angepaßt.
+- VERBESSERT: Referenzbereiche zu Immunologie-Vorlage im Ambulanzstil hinzugefügt.
+
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+
+
 Version 2.1.13 (2015-11-12)
 ========================================================================

--- a/publish/zaaReloaded2.iss
+++ b/publish/zaaReloaded2.iss
@ -3,7 +3,7 @@
 ; Apache License Version 2.0

 [Setup]
-#define DEBUG
+; #define DEBUG

 ; Read the semantic and the installer file version from the VERSION file
 #define FILE_HANDLE FileOpen("..\zaaReloaded2\VERSION")
--- a/www/versioninfo.txt
+++ b/www/versioninfo.txt
@ -1,4 +1,4 @@
-2.1.13
+2.2.0
 http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
-8dc26f4c80bb91a9384c6cf3818b411e3056bb15b00c334eac5edafa764a52f0  publish/release/zaaReloaded-2.1.13.exe
+aef576f192cb58aef59670df6407e36e2403675dc558af56430babbd218b6c0e  publish/release/zaaReloaded-2.2.0.exe

--- a/zaaReloaded2/VERSION
+++ b/zaaReloaded2/VERSION
@ -1,2 +1,2 @@
-2.1.13
-2.1.13.0
+2.2.0
+2.2.0.0