vratiskol
|
cfe2b2797e
|
Revert "Merge branch 'master' into hf_mf_sim"
This reverts commit cbea5d9d02, reversing
changes made to b66152feb2.
|
2019-03-15 21:45:00 +01:00 |
|
vratiskol
|
6a52b6074f
|
Sync from Upstream
|
2019-03-15 21:17:07 +01:00 |
|
Philippe Teuwen
|
0373696662
|
make style
|
2019-03-10 00:00:59 +01:00 |
|
Philippe Teuwen
|
0d9223a547
|
client: fix mix of spaces & tabs
|
2019-03-09 23:35:06 +01:00 |
|
Philippe Teuwen
|
60f292b18e
|
remove spurious spaces & tabs at end of lines
|
2019-03-09 08:59:13 +01:00 |
|
merlokk
|
ee9daac029
|
Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad
# Conflicts:
# client/cmdhfmf.c
# client/mifare/mifarehost.c
|
2019-03-01 19:37:43 +02:00 |
|
merlokk
|
3b21b17509
|
move mifare stuff to its folder
|
2019-02-21 19:15:46 +02:00 |
|