Merge branch 'master' of git+ssh://git.taler.net/exchange

contrib/gana

@@ -1 +1 @@
-Subproject commit b4afa5a86e4317cf8b9d2868e8e509e261c54281
+Subproject commit c8b33d0884b0ad9f9583b2a74ddd8859b0caedfb

src/bank-lib/Makefile.am

@@ -7,7 +7,7 @@ if USE_COVERAGE
 endif
 
 bin_PROGRAMS = \
-  taler-bank-transfer
+  taler-wire-gateway-client
 
 noinst_PROGRAMS = \
   taler-fakebank-run
@@ -19,9 +19,9 @@ taler_fakebank_run_LDADD = \
   $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetutil
 
-taler_bank_transfer_SOURCES = \
-  taler-bank-transfer.c
-taler_bank_transfer_LDADD = \
+taler_wire_gateway_client_SOURCES = \
+  taler-wire-gateway-client.c
+taler_wire_gateway_client_LDADD = \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/json/libtalerjson.la \

src/bank-lib/taler-wire-gateway-client.c

@@ -729,7 +729,7 @@ main (int argc,
   if (GNUNET_OK !=
       GNUNET_PROGRAM_run (argc, argv,
                           "taler-bank-transfer",
-                          "Execute bank transfer to the exchange",
+                          "Client tool of the Taler Wire Gateway",
                           options,
                           &run, NULL))
     return 1;