From: iceman1001 Date: Sun, 16 Oct 2016 19:51:10 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/iceman1001/proxmark3 X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/16a9209c042b33d23cf85d07699e8d026e7b288b?hp=da1f16d6ef6f9433b9a5a3475541ebbf45c1ba72 Merge branch 'master' of https://github.com/iceman1001/proxmark3 --- diff --git a/README.md b/README.md index 3653366f..e50d3c50 100644 --- a/README.md +++ b/README.md @@ -192,7 +192,7 @@ Install to `C:\Qt` and choose the following components to be installed: - Tools - MinGW In your shell from MSYS (see below), make sure you set QTDIR to your QT installation and add its bin to your path as well: -`export QTDIR=/c/Qt/5.6/mingw492_32` +`export QTDIR=/c/Qt/5.6/mingw49_32` `export PATH=$PATH:$QTDIR/bin` ### 2. MSYS @@ -230,7 +230,7 @@ Download and install Git for Windows: https://git-scm.com/download/win - Set the environment: `export DEVKITARM=/c/devkitPro/devkitARM` `export PATH=$PATH:$DEVKITARM/bin` -`export QTDIR=/c/Qt/5.6/mingw492_32` +`export QTDIR=/c/Qt/5.6/mingw49_32` `export PATH=$PATH:$QTDIR/bin` - Clone iceman fork