merge default ENGINE-198
authorKrista Bennett <krista@pep-project.org>
Wed, 19 Apr 2017 10:50:29 +0200
branchENGINE-198
changeset 171731e2c590f693
parent 1716 df5bc17b384b
parent 1712 af3d488f90d8
child 1718 66080da35370
child 1719 b1e855594c13
merge default
     1.1 --- a/Makefile.conf	Wed Apr 19 10:48:39 2017 +0200
     1.2 +++ b/Makefile.conf	Wed Apr 19 10:50:29 2017 +0200
     1.3 @@ -14,7 +14,7 @@
     1.4  YML_PATH=$(HOME)/yml2
     1.5  ASN1C=asn1c
     1.6  ASN1C_INCLUDE=/opt/local/share/asn1c
     1.7 -LIBGPGME=/opt/local/lib/libgpgme.11.dylib
     1.8 +#LIBGPGME=/opt/local/lib/libgpgme.11.dylib
     1.9  
    1.10  # C makros (not environment variables) to overwrite:
    1.11  #