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

..

CMakeLists.txt

Renames contrib/win32/nfc_win32.c to contrib/win32/stdlib.c

2013-01-31 16:09:41 +01:00

Makefile.am

Autotools now distributes nfc-read-forum-tag3 man page in tarball

2012-10-30 22:59:43 +01:00

mifare.c

Various typos

2013-01-31 21:58:29 +01:00

mifare.h

Use copyright format recommended by GNU project.

2012-10-21 14:09:16 +00:00

nfc-emulate-forum-tag4.1

utils/nfc-emulate-forum-tag4: add support for v2.0 of the spec

2012-05-14 22:13:19 +00:00

nfc-emulate-forum-tag4.c

Add timeout parameter to nfc_emulate_target() function.

2013-01-30 00:10:24 +01:00

nfc-list.1

verbose option back for nfc-list, and newly implemented in nfc-poll

2012-01-04 21:29:43 +00:00

nfc-list.c

Examples and utils are now updated to use the requiered nfc_context

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

nfc-mfclassic.1

utils/nfc-mfclassic: remove non-conscistent "extract payload" option in nfc-mfclassic and use MIFARE instead of Mifare typo (Thanks to Thomas Hood)

2012-02-15 13:41:38 +00:00

nfc-mfclassic.c

Examples and utils are now updated to use the requiered nfc_context

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

nfc-mfultralight.1

Fix some spelling mistakes

2012-05-13 13:10:15 +00:00

nfc-mfultralight.c

Examples and utils are now updated to use the requiered nfc_context

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

nfc-read-forum-tag3.1

add missing manpages.

2011-11-22 15:23:18 +00:00

nfc-read-forum-tag3.c

Moves Windows conditional code to dedicated files

2013-01-31 15:58:20 +01:00

nfc-relay-picc.1

Fix some spelling mistakes

2012-05-13 13:10:15 +00:00

nfc-relay-picc.c

Fix returned value ((res=f()<0)) => ((res=f())<0); this solves a bug in nfc-relay-picc

2013-01-22 00:56:34 +01:00

nfc-scan-device.1

Add -i option to nfc-scan-device to allow intrusive scan and add a manpage for this util.

2012-10-21 14:12:04 +00:00

nfc-scan-device.c

nfc-scan-device: fix option -i

2013-01-29 13:52:53 +01:00

nfc-utils.c

Use copyright format recommended by GNU project.

2012-10-21 14:09:16 +00:00

nfc-utils.h

Use copyright format recommended by GNU project.

2012-10-21 14:09:16 +00:00