mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 21:40:52 -05:00 
			
		
		
		
	Merge branch 'hotfix-2.0.0-rc3' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc3
This commit is contained in:
		
						commit
						1d2665a978
					
				@ -2935,7 +2935,7 @@ Right click for insert and delete options.</string>
 | 
				
			|||||||
             </sizepolicy>
 | 
					             </sizepolicy>
 | 
				
			||||||
            </property>
 | 
					            </property>
 | 
				
			||||||
            <property name="toolTip">
 | 
					            <property name="toolTip">
 | 
				
			||||||
             <string><html><head/><body><p>North American VHF/UHF/Mucrowave contests and others in which a 4-character grid locator is the required exchange.</p></body></html></string>
 | 
					             <string><html><head/><body><p>North American VHF/UHF/Microwave contests and others in which a 4-character grid locator is the required exchange.</p></body></html></string>
 | 
				
			||||||
            </property>
 | 
					            </property>
 | 
				
			||||||
            <property name="text">
 | 
					            <property name="text">
 | 
				
			||||||
             <string>NA VHF Contest</string>
 | 
					             <string>NA VHF Contest</string>
 | 
				
			||||||
 | 
				
			|||||||
@ -17,10 +17,7 @@ subroutine hash10(n10,c13)
 | 
				
			|||||||
  do i=1,nzhash
 | 
					  do i=1,nzhash
 | 
				
			||||||
     if(ihash10(i).eq.n10) then
 | 
					     if(ihash10(i).eq.n10) then
 | 
				
			||||||
        c13=callsign(i)
 | 
					        c13=callsign(i)
 | 
				
			||||||
        if(c13(1:1).ne.'<') then
 | 
					        c13='<'//trim(c13)//'>'//'         '
 | 
				
			||||||
           n=len(trim(c13))
 | 
					 | 
				
			||||||
           c13='<'//trim(c13)//'>'//'         '
 | 
					 | 
				
			||||||
        endif
 | 
					 | 
				
			||||||
        go to 900
 | 
					        go to 900
 | 
				
			||||||
     endif
 | 
					     endif
 | 
				
			||||||
  enddo
 | 
					  enddo
 | 
				
			||||||
@ -36,10 +33,7 @@ subroutine hash12(n12,c13)
 | 
				
			|||||||
  do i=1,nzhash
 | 
					  do i=1,nzhash
 | 
				
			||||||
     if(ihash12(i).eq.n12) then
 | 
					     if(ihash12(i).eq.n12) then
 | 
				
			||||||
        c13=callsign(i)
 | 
					        c13=callsign(i)
 | 
				
			||||||
        if(c13(1:1).ne.'<') then
 | 
					        c13='<'//trim(c13)//'>'//'         '
 | 
				
			||||||
           n=len(trim(c13))
 | 
					 | 
				
			||||||
           c13='<'//trim(c13)//'>'//'         '
 | 
					 | 
				
			||||||
        endif
 | 
					 | 
				
			||||||
        go to 900
 | 
					        go to 900
 | 
				
			||||||
     endif
 | 
					     endif
 | 
				
			||||||
  enddo
 | 
					  enddo
 | 
				
			||||||
@ -56,10 +50,7 @@ subroutine hash22(n22,c13)
 | 
				
			|||||||
  do i=1,nzhash
 | 
					  do i=1,nzhash
 | 
				
			||||||
     if(ihash22(i).eq.n22) then
 | 
					     if(ihash22(i).eq.n22) then
 | 
				
			||||||
        c13=callsign(i)
 | 
					        c13=callsign(i)
 | 
				
			||||||
        if(c13(1:1).ne.'<') then
 | 
					        c13='<'//trim(c13)//'>'//'         '
 | 
				
			||||||
           n=len(trim(c13))
 | 
					 | 
				
			||||||
           c13='<'//trim(c13)//'>'//'         '
 | 
					 | 
				
			||||||
        endif
 | 
					 | 
				
			||||||
        go to 900
 | 
					        go to 900
 | 
				
			||||||
     endif
 | 
					     endif
 | 
				
			||||||
  enddo
 | 
					  enddo
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user