[pkg-opensc-commit] [libp11] 26/33: Merge pull request #97 from matthauck/pkcs11-standalone

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libp11.

commit fc6fc84c8eca636e4f036b3eab7ee4cf6d5ae160
Merge: 1868c69 dd42a0d
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Tue Sep 6 06:58:03 2016 +0200

    Merge pull request #97 from matthauck/pkcs11-standalone
    
    Include libp11 objects in the pkcs11 engine library

 src/Makefile.am  | 2 +-
 src/Makefile.mak | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/libp11.git