merchant: master 7ac81ca8

Author Committer Branch Timestamp Parent
Marcello Stanisci Marcello Stanisci master 2016-03-15 16:22 master 9d76bbc9
Changeset Merge branch 'master' of ssh://taler.net/var/git/merchant
mod - COPYING Diff File
add - COPYING.AGPL Diff File
add - COPYING.GPL Diff File
add - COPYING.LGPL Diff File
mod - Makefile.am Diff File
mod - configure.ac Diff File
add - examples/Makefile.am Diff File
add - examples/blog/articles/COPYING Diff File
add - examples/blog/articles/Makefile.am Diff File
mod - src/include/taler_merchant_service.h Diff File
mod - src/include/taler_merchantdb_lib.h Diff File
mod - src/include/taler_merchantdb_plugin.h Diff File
mod - src/lib/merchant_api_context.c Diff File
mod - src/lib/merchant_api_context.h Diff File
mod - src/lib/merchant_api_json.c Diff File
mod - src/lib/merchant_api_json.h Diff File
mod - src/lib/merchant_api_pay.c Diff File
mod - src/lib/test_merchant_api.c Diff File
mod - src/tests/test_contract.c Diff File