4 Commits

Author	SHA1	Message	Date
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
merlokk	3b21b17509	move mifare stuff to its folder	2019-02-21 19:15:46 +02:00
merlokk	61ea3109c9	start merge	2018-10-24 18:18:05 +03:00