Merge pull request 'Webcam QrCode Scanner' (#367) from tobtoht/feather:qrscanner...

author tobtoht <tobtoht@noreply.git.featherwallet.org>

Sun, 27 Jun 2021 00:45:13 +0000 (00:45 +0000)

committer tobtoht <tobtoht@noreply.git.featherwallet.org>

Sun, 27 Jun 2021 00:45:13 +0000 (00:45 +0000)
author tobtoht <tobtoht@noreply.git.featherwallet.org>
Sun, 27 Jun 2021 00:45:13 +0000 (00:45 +0000)
committer tobtoht <tobtoht@noreply.git.featherwallet.org>
Sun, 27 Jun 2021 00:45:13 +0000 (00:45 +0000)
diff --cc src/mainwindow.cpp
Simple merge
diff --cc src/mainwindow.h
Simple merge
author	tobtoht <tobtoht@noreply.git.featherwallet.org>
	Sun, 27 Jun 2021 00:45:13 +0000 (00:45 +0000)
committer	tobtoht <tobtoht@noreply.git.featherwallet.org>
	Sun, 27 Jun 2021 00:45:13 +0000 (00:45 +0000)
		1	2
src/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/mainwindow.h	patch \|	diff1 \|	diff2 \|	blob \| history