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
..
2013-01-31 16:17:37 +01:00
2013-01-31 16:12:14 +01:00
2013-01-31 16:12:14 +01:00