aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2015-12-04 09:27:10 -0500
committerJack Lloyd <[email protected]>2015-12-04 09:27:10 -0500
commit760c8434227be7cea3ac315b3d5610e959af600e (patch)
treef93d13d28b07d046027cc2e61c0e64b641076b84 /doc
parent6ffc6d4da50bc23e0d5ba039fe1e18825513a5f2 (diff)
parent12bd679149183d59927c433eb95fbc4f68cfd4b3 (diff)
Merge pull request #321 from matejk/fix_algo_registry_locking_windows
Algo_Registry: Use CRITICAL_SECTION on Windows to prevent hang during initialization
Diffstat (limited to 'doc')
-rw-r--r--doc/credits.rst5
-rw-r--r--doc/license.txt1
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/credits.rst b/doc/credits.rst
index 8a18d2237..6d62b6380 100644
--- a/doc/credits.rst
+++ b/doc/credits.rst
@@ -55,6 +55,11 @@ snail-mail address (S), and Bitcoin address (B).
D: LZMA compression module
S: Czech Republic
+ N: Matej Kenda
+ D: Locking in Algo_Registry for Windows OS
+ S: Slovenia
+
N: Adam Langley
D: Curve25519
diff --git a/doc/license.txt b/doc/license.txt
index 4e3907f48..2eb91b622 100644
--- a/doc/license.txt
+++ b/doc/license.txt
@@ -24,6 +24,7 @@ Copyright (C) 1999-2013,2014,2015 Jack Lloyd
2014 Andrew Moon
2015 Daniel Seither (Kullo GmbH)
2015 Simon Warta (Kullo GmbH)
+ 2015 Matej Kenda (TopIT d.o.o.)
All rights reserved.
Redistribution and use in source and binary forms, with or without