Merge branch 'master' into develop

Browse Source

# Conflicts:
#	AstroMath.UnitTests/AstroMath.UnitTests.csproj
#	FocuserTestConsole/FocuserTestConsole.csproj
#	FocuserTestConsole/Properties/AssemblyInfo.cs
#	FocuserTestConsole/app.config
#	Meade.net.Setup/Config.wxi
#	Meade.net.Setup/Product.wxs
#	Meade.net.Telescope/Meade.net.Telescope.csproj
#	Meade.net.Telescope/Properties/AssemblyInfo.cs
#	Meade.net.Telescope/Telescope.cs
#	Meade.net.Telescope/app.config
#	Meade.net.focuser/Focuser.cs
#	Meade.net.focuser/Meade.net.focuser.csproj
#	Meade.net.focuser/Properties/AssemblyInfo.cs
#	Meade.net.focuser/Properties/Resources.Designer.cs
#	Meade.net.focuser/Properties/Settings.Designer.cs
#	Meade.net.focuser/app.config
#	Meade.net.sln
#	Meade.net/Localization/LocalisationHelper.cs
#	Meade.net/Meade.net.csproj
#	Meade.net/Properties/AssemblyInfo.cs
#	Meade.net/Properties/Resources.Designer.cs
#	Meade.net/SharedResources.cs
#	Meade.net/app.config
#	TelescopeTestConsole/Program.cs
#	TelescopeTestConsole/TelescopeTestConsole.csproj
#	TelescopeTestConsole/app.config

...

This commit is contained in:

Colin Dawson

2019-06-08 20:53:09 +01:00

parent 4c92bf13c2 58ba1e6ee3

commit d8b4886b85

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