]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
projects / proxmark3-svn / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4a6780 5acd195)
Merge pull request #302 from pwpiwi/fix_QtThreads v3.0.0
authormarshmellow42 <marshmellow42@users.noreply.github.com>
Sun, 4 Jun 2017 23:53:28 +0000 (19:53 -0400)
committerGitHub <noreply@github.com>
Sun, 4 Jun 2017 23:53:28 +0000 (19:53 -0400)
fixing the crash on exit (issue #284)

1  2 
client/Makefile patch | diff1 | diff2 | blob | history

diff --cc client/Makefile
Simple merge
Proxmark3 GIT tracking
Impressum, Datenschutz