Commit 5159ea8
committed
Merge branch 'master' of https://github.com/underautomation/UniversalRobots
# Conflicts:
# .NET/Libraries/net35/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net40/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net45/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net451/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net452/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net46/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net461/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net462/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net47/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net471/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net472/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net48/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/net50/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/netcoreapp2.0/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/netcoreapp2.1/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/netcoreapp2.2/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/netcoreapp3.0/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/netstandard2.0/UnderAutomation.UniversalRobots.dll
# .NET/Libraries/netstandard2.1/UnderAutomation.UniversalRobots.dll
# LabVIEW/Library/UnderAutomation.UniversalRobots.dll
# Python/Package/lib/UnderAutomation.UniversalRobots.dllFile tree
0 file changed
+0
-0
lines changed0 file changed
+0
-0
lines changed
0 commit comments