From: andre ebersold <andre.ebersold@siemens.com>
Date: Tue, 11 Jun 2024 12:23:45 +0000 (+0200)
Subject: Merge branch 'master' into dev/reqif
X-Git-Url: https://git.ebersold.fr/?a=commitdiff_plain;h=b5940c2cb81054b64975f9af6bfd2046bee9f6b5;p=antcc.git

Merge branch 'master' into dev/reqif

# Conflicts:
#	.gitignore
---

b5940c2cb81054b64975f9af6bfd2046bee9f6b5
diff --cc .gitignore
index 9dce1e3,b4f904e..0493c6a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,6 @@@
  
 +Build
 +*~
+ *.*~
+ *.bak
+ *.swp