Merge branch 'pick' into master
authorPhilipp Takacs <philipp@bureaucracy.de>
Sun, 30 Dec 2018 01:37:25 +0000 (02:37 +0100)
committerPhilipp Takacs <philipp@bureaucracy.de>
Sun, 30 Dec 2018 01:37:25 +0000 (02:37 +0100)
scan and pick is merged and pick matching is streamlined

1  2 
h/prototypes.h
man/pick.man1
uip/Makefile.in

diff --cc h/prototypes.h
Simple merge
diff --cc man/pick.man1
Simple merge
diff --cc uip/Makefile.in
Simple merge