exchange: master 1d740824

Diff Back to Repository
Author Committer Branch Timestamp Parent
Christian Grothoff Christian Grothoff master 2016-11-07 15:39 master 247b8e33
Changeset resolving merge issue
mod - .gitignore Diff File
mod - .gitmodules Diff File
add - default.nix Diff File
mod - doc/paper/taler.bib Diff File
mod - doc/paper/taler.tex Diff File
add - gnunet Diff File
add - m4/libgcrypt.m4 Diff File
mod - src/auditordb/Makefile.am Diff File
mod - src/auditordb/plugin_auditordb_postgres.c Diff File
add - src/auditordb/test-auditor-db-postgres.conf Diff File
add - src/auditordb/test_auditordb.c Diff File
mod - src/bank-lib/test_bank_api.c Diff File
mod - src/benchmark/taler-exchange-benchmark.c Diff File
mod - src/exchange-lib/Makefile.am Diff File
mod - src/exchange-lib/exchange_api_admin.c Diff File
mod - src/exchange-lib/exchange_api_common.c Diff File
rm - src/exchange-lib/exchange_api_common.h Diff File
mod - src/exchange-lib/exchange_api_deposit.c Diff File
mod - src/exchange-lib/exchange_api_refresh.c Diff File
mod - src/exchange-lib/exchange_api_refresh_link.c Diff File
mod - src/exchange-lib/exchange_api_refund.c Diff File
mod - src/exchange-lib/exchange_api_reserve.c Diff File
mod - src/exchange-lib/exchange_api_track_transaction.c Diff File
mod - src/exchange-lib/exchange_api_track_transfer.c Diff File
mod - src/exchange-lib/exchange_api_wire.c Diff File
mod - src/exchange-lib/test_exchange_api.c Diff File
mod - src/exchange/taler-exchange-httpd_admin.c Diff File
mod - src/exchange/taler-exchange-httpd_db.c Diff File
mod - src/exchange/taler-exchange-httpd_deposit.c Diff File
mod - src/exchange/taler-exchange-httpd_parsing.c Diff File
mod - src/exchange/taler-exchange-httpd_refresh.c Diff File
mod - src/exchange/taler-exchange-httpd_refund.c Diff File
mod - src/exchange/taler-exchange-httpd_reserve.c Diff File
mod - src/exchange/taler-exchange-httpd_responses.c Diff File
mod - src/exchange/taler-exchange-httpd_responses.h Diff File
mod - src/exchange/taler-exchange-httpd_test.c Diff File
mod - src/exchange/taler-exchange-httpd_tracking.c Diff File
mod - src/exchangedb/plugin_exchangedb_postgres.c Diff File
mod - src/exchangedb/test_exchangedb.c Diff File
mod - src/include/taler_auditordb_plugin.h Diff File
mod - src/include/taler_error_codes.h Diff File
mod - src/include/taler_exchange_service.h Diff File
mod - src/include/taler_json_lib.h Diff File
mod - src/include/taler_util.h Diff File
mod - src/json/json.c Diff File
add - taler-exchange-dev.nix Diff File