mirror of
https://github.com/n5ac/smartsdr-dsp.git
synced 2026-03-20 10:54:37 +01:00
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 |
||
|---|---|---|
| .. | ||
| CODEC2_GUI_INSTALLER.vdproj | ||
| Flex_ThumbDV_Waveform_Inno_Install_Script.iss | ||