[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-donau] 02/02: Merge remote-tracking branch 'refs/remotes/origin/m
|
From: |
gnunet |
|
Subject: |
[taler-donau] 02/02: Merge remote-tracking branch 'refs/remotes/origin/master' |
|
Date: |
Mon, 15 Jan 2024 15:21:02 +0100 |
This is an automated email from the git hooks/post-receive script.
johannes-casaburi pushed a commit to branch master
in repository donau.
commit 3d2ddee73b9ac0d340403f1fded562a67a01ba3e
Merge: ad8ed9e dfda564
Author: Casaburi Johannes <johannes.casaburi@students.bfh.ch>
AuthorDate: Mon Jan 15 15:20:49 2024 +0100
Merge remote-tracking branch 'refs/remotes/origin/master'
.gitignore | 4 ++++
src/Makefile.am | 2 +-
src/json/Makefile.am | 11 ++++++-----
src/json/donau_json.c | 16 +---------------
src/lib/Makefile.am | 4 +++-
src/util/Makefile.am | 6 +++---
src/util/donau_crypto.c | 22 ----------------------
7 files changed, 18 insertions(+), 47 deletions(-)
diff --cc src/Makefile.am
index 76311fe,03e2b0f..4745812
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -12,9 -15,9 +12,9 @@@ SUBDIRS =
include \
util \
json \
- $(PQ_DIR) \
+ pq \
donaudb \
- donau \
+ #donau \
lib \
donau-tools \
testing
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.