From: iceman <iceman@iuse.se>
Date: Wed, 5 Oct 2016 15:57:29 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/fb6e631fbb573765120d330eb7e83f44bdbde508?ds=inline;hp=-c

Merge branch 'master' of https://github.com/iceman1001/proxmark3
---

fb6e631fbb573765120d330eb7e83f44bdbde508
diff --combined install.sh
index 666555f5,798efac8..798efac8
mode 100755,100644..100755
--- a/install.sh
+++ b/install.sh
@@@ -2,7 -2,7 +2,7 @@@ echo "Updating your system...
  
  # install dependencies for Proxmark3 source code.
  sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev gcc-arm-none-eabi 
- sudo apt-get install libusb-0.1-4 libusb-dev libqt4-dev ncurses-dev perl pkg-config wget
+ sudo apt-get install libusb-0.1-4 libusb-dev libqt4-dev libncurses5-dev perl pkg-config wget
  
  #cleaning up
  sudo apt-get install -f -y
@@@ -12,5 -12,5 +12,5 @@@ sudo apt-get clean -
  sudo apt-get update
  
  # Where is my device?
- dmesg | tail -10
+ #dmesg | tail -10