Skip to content
Commit f79e8d53 authored by developer2's avatar developer2
Browse files

Merge branch 'master' of https://git.d-logic.net/nfc-rfid-reader-sdk/ufr-lib

# Conflicts:
#	include/uFCoder.h
#	linux/aarch64/libuFCoder-aarch64.so
#	linux/arm-hf/libuFCoder-armhf.so
#	linux/arm/libuFCoder-arm.so
#	linux/x86/libuFCoder-x86.so
#	linux/x86_64/libuFCoder-x86_64.so
#	osx/x86_64/libuFCoder.dylib
#	windows/static-x86/libuFCoder-x86.a
#	windows/static-x86_64/libuFCoder-x86_64.a
#	windows/x86/uFCoder-x86.def
#	windows/x86/uFCoder-x86.dll
#	windows/x86_64/uFCoder-x86_64.def
#	windows/x86_64/uFCoder-x86_64.dll
parents 5b12e545 0a6e041e
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment