[Opensc-commits] [OpenSC/OpenSC] 9680bc: Merge branch 'master' into 0.15.0

[GitHub <no...@gi...>]

  Branch: refs/heads/0.15.0
  Home:   https://github.com/OpenSC/OpenSC
  Commit: 9680bc4fec3e28d6972ae64dd068893f8ff20a71
      https://github.com/OpenSC/OpenSC/commit/9680bc4fec3e28d6972ae64dd068893f8ff20a71
  Author: Viktor Tarasov <vik...@gm...>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M etc/opensc.conf.in
    M src/common/libscdl.c
    M src/libopensc/card-acos5.c
    M src/libopensc/card-belpic.c
    M src/libopensc/card-iasecc.c
    M src/libopensc/card-isoApplet.c
    M src/libopensc/card-myeid.c
    M src/libopensc/card.c
    M src/libopensc/cards.h
    M src/libopensc/ctx.c
    M src/libopensc/internal-winscard.h
    M src/libopensc/pkcs15-pubkey.c
    M src/libopensc/pkcs15-sec.c
    M src/libopensc/reader-pcsc.c
    M src/libopensc/user-interface.c
    M src/minidriver/minidriver.c
    M src/pkcs11/mechanism.c
    M src/pkcs15init/isoApplet.profile
    M src/pkcs15init/pkcs15-isoApplet.c
    M src/tools/pkcs11-tool.c
    M src/tools/sc-hsm-tool.c

  Log Message:
  -----------
  Merge branch 'master' into 0.15.0