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 21:58:29 +01:00
2012-05-13 13:10:15 +00:00
2011-11-22 15:23:18 +00:00
2012-05-13 13:10:15 +00:00