search

nfc-tools / libfreefare

A convenience API for NFC cards manipulations on top of libnfc.
Other
395 stars 106 forks source link

Added freefare_version() function #104

Closed broth-itk closed 5 years ago

broth-itk commented 5 years ago

This is to address

Add a function to get lib version #74

smortex commented 5 years ago

I just pushed a few commits to master that should fix the Travis-CI issue you see with CMake.

You can get them in your branch by rebasing. Assuming you have 2 remotes, origin is the "official" repo and broth-itk is your fork:

  1. git fetch --all (get all commits locally)
  2. git rebase origin/master (add the locally missing commits from origin/master before your local work. Your local commits will be modified, so you will have to use -f to push them next time).
broth-itk commented 5 years ago

Thanks a lot for your git hints :) Looks like I managed to get the changes online. Hope it's getting all right

broth-itk commented 5 years ago

Is there anything to do from my side in order to get this pull request merged?