git.rkrishnan.org Git - pihpsdr.git/commit

]> git.rkrishnan.org Git - pihpsdr.git/commit

projects / pihpsdr.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 12b5590 91be7a0)

author	PA3GSB <admin@pa3gsb.nl>
	Wed, 15 Feb 2017 19:35:20 +0000 (20:35 +0100)
committer	PA3GSB <admin@pa3gsb.nl>
	Wed, 15 Feb 2017 19:35:20 +0000 (20:35 +0100)
commit	3dd332e539cd15c4483db9fb4b112aea9f8e1e90
tree	1e88a47db15b7a99a45fb7c4bb0e494407d9ca8c	tree \| snapshot
parent	12b559000e57550f3765ede8e7220b24632d6dc0	commit \| diff
parent	91be7a0845f640068e6afac66d711e02c84d7566	commit \| diff

merge conflicts

15 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
Makefile.orig	\|	\|	blob
audio.c	diff1 \|	diff2 \|	blob \| history
discovered.h	diff1 \|	diff2 \|	blob \| history
general_menu.c	diff1 \|	diff2 \|	blob \| history
general_menu.c.orig	\|	\|	blob
main.c	diff1 \|	diff2 \|	blob \| history
main.c.orig	\|	\|	blob
radio.c	diff1 \|	diff2 \|	blob \| history
radio.c.orig	\|	\|	blob
toolbar.c	diff1 \|	diff2 \|	blob \| history
toolbar.c.orig	\|	\|	blob
vfo.c	diff1 \|	diff2 \|	blob \| history
vfo.c.orig	\|	\|	blob
wdsp_init.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.