# HG changeset patch
# User Magnus Schieder <magnus.schieder@intevation.de>
# Date 1589287867 -7200
# Node ID e17b7d1d9220474173af61b90dc27aa27a5babcb
# Parent  2d8294d02636995e9e89f2f6222292d6cf76beba# Parent  fbe26b0e59ed279f89cf75094c846cd7148048c9
merge

diff -r fbe26b0e59ed -r e17b7d1d9220 .hgtags
--- a/.hgtags	Tue May 12 14:41:40 2020 +0200
+++ b/.hgtags	Tue May 12 14:51:07 2020 +0200
@@ -29,3 +29,6 @@
 e6cd694f04605713cc09d80a76e99dfb0060bdae 3.4
 e6cd694f04605713cc09d80a76e99dfb0060bdae 3.4
 23107de98a4f006d62fcda0e503c774d73a3ff23 3.4
+8b92ed4e40d8b0ae407fe1a44965bdcfc45410d5 3.5
+8b92ed4e40d8b0ae407fe1a44965bdcfc45410d5 3.5
+15a4c471399ce175d436dd65056b344abc6b7e38 3.5
diff -r fbe26b0e59ed -r e17b7d1d9220 CHANGES
--- a/CHANGES	Tue May 12 14:41:40 2020 +0200
+++ b/CHANGES	Tue May 12 14:51:07 2020 +0200
@@ -1,5 +1,8 @@
 (unreleased)
 
+
+3.5 2020-04-23
+
  * In getan-report project keys can now be specified with SQL patterns.
    This allows projects and their sub-projects to be better selected for output.
    % - zero, one, or multiple characters
@@ -29,6 +32,7 @@
    With the arrow keys you can move through an array with the old descriptions
    of the project which is then displayed in edit_text and can be edited.
 
+
 3.2 2018-11-30
 
  * Fix human_time() to output one hour instead of 60 minutes. This defect was
diff -r fbe26b0e59ed -r e17b7d1d9220 getan/__init__.py
--- a/getan/__init__.py	Tue May 12 14:41:40 2020 +0200
+++ b/getan/__init__.py	Tue May 12 14:51:07 2020 +0200
@@ -6,5 +6,5 @@
 # This is Free Software licensed under the terms of GPLv3 or later.
 # For details see LICENSE coming with the source of 'getan'.
 
-__version_info__ = ("3", "5" "dev1")
+__version_info__ = ("3", "5", "dev1")
 __version__ = '.'.join(__version_info__)