Commit Graph

5 Commits

Author SHA1 Message Date
Bill Somerville
00f39e3ea0
Fix a couple of merging mishaps 2019-11-25 15:04:51 +00:00
Bill Somerville
fb1b2e7687 Tagging the WSJT-X v2.1.1 release
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEUELwYiy7vDRM+hTD2GSwbR6BYY8FAl3a8/QACgkQ2GSwbR6B
 YY8y+ggAqwaaCRMCSwDzStooYjStJErVoZ/yB//MmoF+798TBb+3MkiT+KclW7aN
 rxTOmEJ+a84PmsiW6Qz/AAcHPnbKDhtwWASZooopgNYDfgyaUib3HfIa+cFJO6my
 OUzlTsH94yDxeBCWOtf1dLiP0YwJKfp/vxzbfDAWXTd4dx3Ok/7KwghYocmP3eCq
 ruZ+dWojQzwE+h50P6B9gTFxGWMHUDDNeZ/c8u494wqDQvQaRoM9oOnQWzlGiMis
 JaerraI52JEdFLnXjtLYeyXtfg+zA0KvRY2DWy1aCPpGkNjy3DPNlOA+cDQpzBru
 NIqsUF+GplgkVs3sKNLXq36ZgaBQBg==
 =5w4B
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEUELwYiy7vDRM+hTD2GSwbR6BYY8FAl3a9R8ACgkQ2GSwbR6B
 YY9SWQf+JdfIvlHy8ExSs9ImCLck/e66V2OAqaEONQX1bEC4QiG3M/rVJGgf2iFz
 ZFshtilsajlpsYZQIFToTmJmI76eGLAmyNIcZN2WpcJQMNWZnxqklMj2wIHbRh+g
 Pvw3FC+lc4LUjZCCMYrVjNXxsRmQtjqV1lVFBnmrAWCdrgHmhyrVbPZT4B+fRTXL
 ikw/BiRgxhI0aoIWKzNrtztMYUBjanKLTHE81AVgsgZkBDNybOjR7mE2E/Jwc4Qx
 mVu+Z0uI+bVuBlMOrqp0K+rrUz7qMZe5/AMSRbgzwfueEOIShgu2wrfV++3JDXLH
 AhtIAcL/b39RBx0jkFE8rBKaZpkoAw==
 =DNp6
 -----END PGP SIGNATURE-----

Merge tag 'wsjtx-2.1.1' into develop

Tagging the WSJT-X v2.1.1 release
2019-11-24 21:24:39 +00:00
Bill Somerville
01aaa852e3
Updates to support Qt v5.13
Replacement of deprecated Qt functions and member functions.
2019-07-08 01:37:04 +01:00
sirhc808
27d4471cde Merge branch 'ft9_refactor' into feat-refactor
# Conflicts:
#	CMakeLists.txt
#	lib/ft4/getcandidates4.f90
#	lib/ft4/sync4d.f90
2019-07-02 12:06:14 -05:00
sirhc808
ee5d5c8ae9 improve physical structure 2019-07-02 10:19:43 -05:00