Dan Schaper d215fa9ade Resolve merge confict

2015-12-06 20:22:34 -08:00

..

basic-install.sh

Resolve merge confict

2015-12-06 20:22:34 -08:00

uninstall.sh

Add GPL V2+ header

2015-12-06 06:31:49 -08:00