Merge branch 'master' into develop

Browse Source

# Conflicts:
#	MeadeAutostar497/AscomClasses/Telescope.cs
#	MeadeAutostar497/Controller/ITelescopeController.cs
#	MeadeAutostar497/Controller/TelescopeController.cs
#	MeadeAutostar497/MeadeAutostar497.csproj
#	MeadeAutostar497/Properties/AssemblyInfo.cs

...

This commit is contained in:

Colin Dawson

2019-05-14 00:45:58 +01:00

parent 404366d552 777adb260a

commit ef555796a4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available