smartsdr-dsp/pc
Ed Gonzalez 12df08f2d0 Merge branch 'thumbDV_support' of github.com:n5ac/smartsdr-dsp into thumbDV_support
Conflicts:
	pc/CODEC2 GUI/CODEC2 GUI/Form1.Designer.cs
	pc/CODEC2 GUI/CODEC2 GUI/Form1.cs
	pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs
	pc/CODEC2 GUI/CODEC2 GUI/Properties/Resources.Designer.cs
	pc/CODEC2 GUI/CODEC2 GUI/Properties/Settings.Designer.cs
2015-08-31 10:54:53 -05:00
..
CODEC2 GUI Merge branch 'thumbDV_support' of github.com:n5ac/smartsdr-dsp into thumbDV_support 2015-08-31 10:54:53 -05:00