a8a1784a15
# Conflicts: # Modules/Mainframe/gitversion.json # SicRT/gitversion.json # SicSimulator/gitversion.json # SicUI/gitversion.json |
||
---|---|---|
BuildTools/GitVersion | ||
Modules/Mainframe | ||
SicRT | ||
SicSetup/Sic_Setup | ||
SicSimulator | ||
SicUI | ||
SyncCommLib | ||
ThirdParty/MECF.Framework | ||
.gitattributes | ||
.gitignore | ||
SicAutoGE.sln | ||
gitversion.yml |