Alex Lian caa09db5fc Merge remote-tracking branch 'refs/remotes/libnfc/master' ...

Conflicts:
	contrib/windows.h
	libnfc/CMakeLists.txt
	libnfc/log-printf.c
	utils/CMakeLists.txt

2013-01-31 22:17:33 -05:00

..

devd

contrib: move udev and devd files into contrib/

2011-12-09 16:13:32 +00:00

libnfc

New feature: search in a directory for devices configuration files.

2012-12-05 00:51:13 +01:00

linux

Provides modprobe configuration file and instructions for PN533 and Linux >3.1 users.

2012-12-05 00:51:13 +01:00

udev

libnfc-1.5-acr122-usb> import partial work on "ACR122 without PCSC" driver

2012-01-26 15:23:11 +00:00

win32

Merge remote-tracking branch 'refs/remotes/libnfc/master'

2013-01-31 22:17:33 -05:00

Makefile.am

New feature: search in a directory for devices configuration files.

2012-12-05 00:51:13 +01:00

windows.h

make style

2013-01-31 16:12:14 +01:00