]> git.rkrishnan.org Git - pihpsdr.git/commit
merge conflicts
authorPA3GSB <admin@pa3gsb.nl>
Wed, 15 Feb 2017 19:35:20 +0000 (20:35 +0100)
committerPA3GSB <admin@pa3gsb.nl>
Wed, 15 Feb 2017 19:35:20 +0000 (20:35 +0100)
commit3dd332e539cd15c4483db9fb4b112aea9f8e1e90
tree1e88a47db15b7a99a45fb7c4bb0e494407d9ca8c
parent12b559000e57550f3765ede8e7220b24632d6dc0
parent91be7a0845f640068e6afac66d711e02c84d7566
merge conflicts
15 files changed:
Makefile
Makefile.orig
audio.c
discovered.h
general_menu.c
general_menu.c.orig
main.c
main.c.orig
radio.c
radio.c.orig
toolbar.c
toolbar.c.orig
vfo.c
vfo.c.orig
wdsp_init.c