Merge branch 'release-2.2.0' into develop

This commit is contained in:
daniel 2015-12-03 06:12:25 +01:00
commit d1fa0b797d
4 changed files with 15 additions and 5 deletions

View File

@ -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) Version 2.1.13 (2015-11-12)
======================================================================== ========================================================================

View File

@ -3,7 +3,7 @@
; Apache License Version 2.0 ; Apache License Version 2.0
[Setup] [Setup]
#define DEBUG ; #define DEBUG
; Read the semantic and the installer file version from the VERSION file ; Read the semantic and the installer file version from the VERSION file
#define FILE_HANDLE FileOpen("..\zaaReloaded2\VERSION") #define FILE_HANDLE FileOpen("..\zaaReloaded2\VERSION")

View File

@ -1,4 +1,4 @@
2.1.13 2.2.0
http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe http://zaa.nephrowiki.de/downloads/zaaReloaded-$VERSION.exe
8dc26f4c80bb91a9384c6cf3818b411e3056bb15b00c334eac5edafa764a52f0 publish/release/zaaReloaded-2.1.13.exe aef576f192cb58aef59670df6407e36e2403675dc558af56430babbd218b6c0e publish/release/zaaReloaded-2.2.0.exe

View File

@ -1,2 +1,2 @@
2.1.13 2.2.0
2.1.13.0 2.2.0.0