summary refs log tree commit diff
diff options
context:
space:
mode:
authorlogin (tilde.temm)2020-02-21 21:36:31 -0500
committerlogin (tilde.temm)2020-02-21 21:36:31 -0500
commit578b4277ec91a19c266f52090182ad2ce74dea23 (patch)
tree2e2743b2049ec575cb128d87d1ae6292ab2433e9
parent98cbab74e896b673316ea8f7253f9350749bbeec (diff)
parent37a0ec67d4ab00a2470c0e7acf6df844a5c5c5cf (diff)
Merge branch 'master' of https://github.com/login000/tcoin
I made a mistake. I should have done this before making my commits.
That's the only reason why this merge is necessary.
-rw-r--r--pcoin.cpp0
-rw-r--r--tcoin.cpp0
2 files changed, 0 insertions, 0 deletions
diff --git a/pcoin.cpp b/pcoin.cpp
index 4919ac7..e9f563b 100644
--- a/pcoin.cpp
+++ b/pcoin.cpp
diff --git a/tcoin.cpp b/tcoin.cpp
index 2010af1..5bf6faa 100644
--- a/tcoin.cpp
+++ b/tcoin.cpp