Merge branch 'varioustweaks' into newbits
author Gerry1135
()
committer Gerry1135
()
commit 256bebd379fb94bc0da03711e5cb596f0c2655fc
tree 2260f6bb4ba2967e4a0ce4b79d71bf3548c5862d
parent 28db67c38f1bbde4e686ab1a9175d9ae95b1bfa7
parent 58a05ae9c421ccd3ca252cc27cd4498a3c18303d
Merge branch 'varioustweaks' into newbits

Conflicts:
KerbalEngineer.Unity/CanvasGroupFader.cs
KerbalEngineer.Unity/CanvasGroupFader.cs
KerbalEngineer/Flight/Readouts/Miscellaneous/LogSimToggle.cs [ new file with mode 0644 ]
KerbalEngineer/Flight/Readouts/ReadoutLibrary.cs
KerbalEngineer/Flight/Readouts/Surface/HorizontalSpeed.cs
KerbalEngineer/KerbalEngineer.csproj
KerbalEngineer/VesselSimulator/EngineSim.cs
KerbalEngineer/VesselSimulator/PartSim.cs