merged from work

This commit is contained in:
2019-12-20 20:02:14 +01:00
parent 202608651b
commit 11e3a02511
505 changed files with 65307 additions and 823 deletions

5
.gitignore vendored
View File

@ -111,3 +111,8 @@ UpgradeLog*.XML
.vs
*.DotSettings
/Creator/SetupTmpl.cs
nsis/*
/Creator/SetupTemplate1.cs
/KattekerCreator/contrib/AppStub.exe
/KattekerCreator/contrib/AppStub.exe.config
/.idea