Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added freefare_version() function #104

Merged
merged 3 commits into from
Jul 1, 2019

Conversation

broth-itk
Copy link
Contributor

This is to address

Add a function to get lib version #74

Copy link
Contributor

@smortex smortex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the pull request!

I added inline comments, can you address them?

Also, you need to add a line in libfreefare/Makefile.am so that make install creates a symlink freefare_version.3 -> freefare.3 (look at linkedman, their are lots a symlinks already created).

libfreefare/freefare.c Outdated Show resolved Hide resolved
libfreefare/freefare.3 Outdated Show resolved Hide resolved
@smortex
Copy link
Contributor

smortex commented Jan 26, 2019

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
Copy link
Contributor Author

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

@broth-itk
Copy link
Contributor Author

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

Copy link
Contributor

@smortex smortex left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@smortex smortex merged commit 262eace into nfc-tools:master Jul 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants