projects / librfid / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 819827f 074b2fd)
Merge branch 'master' into smartx
authorDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 19 Aug 2014 12:45:33 +0000 (14:45 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Tue, 19 Aug 2014 12:45:33 +0000 (14:45 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.