Kilian
3964c0978e
Merge branch 'master' of https://git.hofmannnet.myhome-server.de/Kilian/DOCSIS-Toolkit
# Conflicts:
# Docsis Toolkit.xcodeproj/project.pbxproj
# Docsis Toolkit.xcodeproj/xcshareddata/xcschemes/All.xcscheme
# Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Converter.xcscheme
# Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Graphic Analysis 2.xcscheme
# Docsis Toolkit.xcodeproj/xcuserdata/Kili2.xcuserdatad/xcschemes/Logger4.xcscheme
# Graphic Analysis 2/Info.plist
# Graphic Analysis 2/buildnum.ver