* options.h, g10.c (main), import.c (parse_import_options, import_one,
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 31 Dec 2003 04:58:52 +0000 (04:58 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 31 Dec 2003 04:58:52 +0000 (04:58 +0000)
commit2a785147be0d0dbec09ea1b63ff5b06d123169b0
tree28d8b1040eae1fcd1216d8f284372565025ff336
parent1228a48ab950c286ef777792b5c6b5e6779cf14c
* 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.
g10/ChangeLog
g10/g10.c
g10/import.c
g10/keyserver.c
g10/options.h