Merge branch 'master' into GeometricRanges
author toadicus
()
committer toadicus
()
commit 2c414d23549b097447349d22525a27c8cfc03678
tree 1227b9efafd3d521e480e6a5941f2e465b459253
parent b191d8bc6c0550f8f01302294c3bfa5c93f1b303
parent fd0326c1e1d330d39b007f8dfaba4d89a088883a
Merge branch 'master' into GeometricRanges

Conflicts:
ARConfiguration.cs
ARFlightController.cs
ARConfiguration.cs
Properties/AssemblyInfo.cs