Commit graph

5609 commits

Author SHA1 Message Date
Oleg Moiseenko 6044d8329b
Merge pull request #165 from merlokk/adddll
add dlls to release
2019-04-17 16:37:43 +03:00
merlokk 6e803aa5ba add dlls to release 2019-04-17 16:20:39 +03:00
iceman1001 3207aaea67 style 2019-04-17 14:57:21 +02:00
iceman1001 1ee3679a98 style 2019-04-17 14:54:42 +02:00
iceman1001 da2aa2c55f test fix 2019-04-17 14:50:07 +02:00
iceman1001 524346901a test fixes 2019-04-17 14:48:32 +02:00
iceman1001 e0bd6b2019 another fix 2019-04-17 14:39:47 +02:00
iceman1001 2044fd4130 fix memleak 2019-04-17 14:35:22 +02:00
iceman1001 f5b7371d7c fix 2019-04-17 14:33:09 +02:00
iceman1001 72f6ba712a textual 2019-04-17 14:01:05 +02:00
iceman1001 bc0e9687d7 use printandlogex 2019-04-17 13:45:55 +02:00
Iceman 8e4362bfc7
Update README.md 2019-04-17 13:06:03 +02:00
iceman1001 6930ca5785 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-17 12:01:33 +02:00
iceman1001 01b83482a7 use printandlogex 2019-04-17 11:58:44 +02:00
iceman1001 53b48ae6a9 use printandlogex 2019-04-17 11:55:52 +02:00
iceman1001 3fdac2577f use printandlogex 2019-04-17 11:54:40 +02:00
iceman1001 d89a5d0a5e use printandlongex 2019-04-17 11:48:17 +02:00
iceman1001 002e6b23fe Use printandlogex 2019-04-17 11:47:32 +02:00
Iceman d2d8c4040d
Merge pull request #163 from McEloff/temp
'hf mf sim' bugs fix, RATS support, etc
2019-04-17 07:41:35 +02:00
Eloff 63f9f11066 'hf mf sim' bugs fix, RATS support, etc 2019-04-16 23:52:05 +03:00
iceman1001 436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
iceman1001 33b4a32dfd removed 2019-04-16 19:06:18 +02:00
iceman1001 8657e17a0b more colors 2019-04-16 17:29:19 +02:00
iceman1001 2639de23c6 rearranged banner output and messages 2019-04-16 17:26:15 +02:00
iceman1001 74ece72b26 textual 2019-04-16 17:21:42 +02:00
Oleg Moiseenko c905676851
Merge pull request #162 from merlokk/appve2
fix fake com port
2019-04-16 18:06:42 +03:00
iceman1001 e04e2d6fa7 revert 2019-04-16 17:02:21 +02:00
iceman1001 597019b98a revert 2019-04-16 17:01:00 +02:00
iceman1001 64c7ee117e revert 2019-04-16 17:00:18 +02:00
iceman1001 aaedeafbb1 style spaces 2019-04-16 16:56:56 +02:00
merlokk d3b6cf7209 fix fake com port 2019-04-16 17:49:52 +03:00
iceman1001 d17191d0a4 style 2019-04-16 16:11:46 +02:00
iceman1001 c6aa14efb7 style 2019-04-16 16:07:25 +02:00
iceman1001 f50566225c styles 2019-04-16 16:02:03 +02:00
iceman1001 eae370fc3d not null? 2019-04-16 15:51:13 +02:00
iceman1001 a6f145bd1a style 2019-04-16 15:47:21 +02:00
iceman1001 d8f756fd14 style 2019-04-16 15:43:53 +02:00
iceman1001 7bc3bea230 style 2019-04-16 15:32:37 +02:00
iceman1001 7b30126371 style 2019-04-16 15:29:18 +02:00
iceman1001 1c4a7709da style 2019-04-16 15:27:25 +02:00
iceman1001 e30dbf3ecd style 2019-04-16 15:22:39 +02:00
iceman1001 87a74e98b8 style 2019-04-16 15:19:53 +02:00
iceman1001 551a9f5fc8 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-16 15:11:51 +02:00
iceman1001 75524b72d1 style 2019-04-16 15:10:55 +02:00
iceman1001 144237abfd style 2019-04-16 15:09:57 +02:00
iceman1001 e5928424b6 style 2019-04-16 15:08:51 +02:00
iceman1001 00f3c281bb style 2019-04-16 15:06:14 +02:00
iceman1001 9a5b23428d style 2019-04-16 15:05:01 +02:00
iceman1001 ac7bd3532f style 2019-04-16 15:02:44 +02:00
Oleg Moiseenko 5fedf86808
Merge pull request #161 from merlokk/ci_fix
appveyor fix
2019-04-16 15:44:51 +03:00