Changeset 4a6f8b0


Ignore:
Timestamp:
Dec 12, 2012, 8:36:27 PM (9 years ago)
Author:
Anders Kaseorg <andersk@mit.edu>
Parents:
6401db3 (diff), 048b1ff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge 048b1ff9986fa6f3572985dbf44dd262dcd81618 into 6401db33a7a1c3156833113bbe6e9eec7a571406
File:
1 edited

Legend:

Unmodified
Added
Removed
  • zcrypt.c

    r97cdbaf5 r048b1ff  
    766766    "gpg",
    767767    "--symmetric",
     768    "--no-options",
     769    "--no-default-keyring",
     770    "--keyring", "/dev/null",
     771    "--secret-keyring", "/dev/null",
    768772    "--batch",
    769773    "--quiet",
     
    846850    "gpg",
    847851    "--decrypt",
     852    "--no-options",
     853    "--no-default-keyring",
     854    "--keyring", "/dev/null",
     855    "--secret-keyring", "/dev/null",
    848856    "--batch",
    849857    "--no-use-agent",
Note: See TracChangeset for help on using the changeset viewer.