Unverified Commit 766b0dd9 authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

Merge pull request #781 from discos/stable

Porting latest hot fixes into master
parents 670fbc28 323fe7da
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
               RepetitionExpireTime="5000000"
               CheckMode="false"
               CheckOscillation="true"
			   OscillationThreshold="0.01"
			   OscillationThreshold="0.025"
			   OscillationAlarmDuration="2000000"	
			   OscillationNumberThreshold="4"	
			   OscillationRecoverWaitTime="3000000">
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
               RepetitionExpireTime="5000000"
               CheckMode="false"
               CheckOscillation="true"
			   OscillationThreshold="0.01"
			   OscillationThreshold="0.025"
			   OscillationAlarmDuration="2000000"	
			   OscillationNumberThreshold="4"	
			   OscillationRecoverWaitTime="3000000">
+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@
	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	maxAzimuth="457.7"
	minAzimuth="-70.7"
	maxAzimuth="452.9"
	minAzimuth="-66.9"
	maxElevation="90.0"
	minElevation="5.0"
	diameter="32.0"
+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@
	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	maxAzimuth="457.7"
	minAzimuth="-70.7"
	maxAzimuth="452.9"
	minAzimuth="-66.9"
	maxElevation="90.0"
	minElevation="5.0"
	diameter="32.0"