gnupg/g10 (ChangeLog g10.c import.c keyserver.c options.h)

[cvs user dshaw]

    Date: Wednesday, December 31, 2003 @ 05:58:52
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog g10.c import.c keyserver.c options.h

* options.h, g10.c (main), import.c (parse_import_options, import_one,
import_secret_one), keyserver.c (keyserver_refresh): Change --merge-only
to --import-option merge-only.  Deprecate --merge-only.


-------------+
 ChangeLog   |    7 +++++++
 g10.c       |    6 +++++-
 import.c    |   28 ++++++++++++++++------------
 keyserver.c |    2 +-
 options.h   |    4 ++--
 5 files changed, 31 insertions(+), 16 deletions(-)