Merge branch 'master' into develop

Browse Source

# Conflicts:
#	AstroMath.UnitTests/Properties/AssemblyInfo.cs
#	FocuserTestConsole/Properties/AssemblyInfo.cs
#	Meade.net.Setup/Config.wxi
#	Meade.net.Setup/Product.wxs
#	Meade.net.Telescope/Properties/AssemblyInfo.cs
#	Meade.net.Telescope/Telescope.cs
#	Meade.net.focuser/Properties/AssemblyInfo.cs
#	Meade.net/Properties/AssemblyInfo.cs
#	TelescopeTestConsole/Properties/AssemblyInfo.cs

...

This commit is contained in:

Colin Dawson

2019-07-07 15:05:20 +01:00

parent 71bc7fd49a c85f65c3e9

commit 335c7da935

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