Merge changes from branches/wsjtx_w back into branches/wsjtx.

Note to developers: Not sure about the makefiles...


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3835 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
2014-03-05 18:20:40 +00:00
parent 9d3ccab76e
commit 7fe8901149
20 changed files with 710 additions and 297 deletions
+1 -1
View File
@@ -37,7 +37,7 @@ subroutine decoder(ss,id2)
ntol65=20
done65=.false.
if(nmode.ge.65 .and. ntxmode.eq.65) then
if((nmode.eq.65 .or. nmode.eq.65+9) .and. ntxmode.eq.65) then
if(newdat.ne.0) dd(1:npts65)=id2(1:npts65)
nf1=nfa
nf2=nfb