Skip to content

Commit

Permalink
Merge pull request #294
Browse files Browse the repository at this point in the history
fbbc6e9 Stricter json generation (Niklas Claesson)
b432a5d Add my signature (Niklas Claesson)
  • Loading branch information
douglasbakkum committed Oct 25, 2019
2 parents ddd4740 + fbbc6e9 commit ed2bf1d
Show file tree
Hide file tree
Showing 11 changed files with 477 additions and 147 deletions.
123 changes: 123 additions & 0 deletions contrib/contributors_gpg_keys/nickez.asc
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

mQINBFzTBQgBEADF13khmlSIesPKAGJnqitu5jX3IWjyyDNkSx+roySL+RTAZkcI
cICJThPCDccpFlngjQaYRgBToeFgRth0tun9TE1Kv35YSWld788JmFYizSdeogw5
loEvPXGwYABEdza/lc37pD1xjBaUQL9DTYdnMsOTuma1QiRq7pl5ZEuWFfHW+N1A
Xqi3a6qHMgHxf/lly2l4KkyOY24LV0tP5PifTIUlTg5h9yp1eQa4zO1ZN68XqFvb
UFI30nW9z8QY6KLkM7s+jbrohD+Brx2xCr0vJe8/Se9mVx9ZNCObPU5g5TvFO5Po
Cfn7wntDUfR3DXz08f5Dvm/W/XF02/2Q3ks8s5VFFXLm11Qpd4rUIKeQdfMOWQgV
pyg+tnpLWK5LYXhtr9oBrmQ8q2ryFep6K1NM0LLnDpvQitoWGz1SgS4FxB/dV0z1
OsGYucxQeLRl9kI2FIDwuhzzMNtgPRKhgaB0LzclxwTVpz9gTT4k6u4OLlZIQ2M/
5NRRMOZiyUToAJX+V9CcdhthPWqSlGNo5xiwNgn5kMtWkXOXqkAhdLiSdm2VLFwA
/m7GqTVcxy33VJJnPB91BDzV3+j3dFf1RzZaRHn3KnTSpXUOJ+MqibehV4h4ABah
3uOnKL298HzJa7e7QSK0dXxx3tKC+/W3fFquIFl9VFjZDxbgrXcd1gj6MQARAQAB
tDBOaWtsYXMgQ2xhZXNzb24gPG5pa2xhcy5jbGFlc3NvbkBzaGlmdGNyeXB0by5j
aD6JAk4EEwEKADgWIQSk58AxJBs7qw7ylR7vBllSZ0aqkgUCXNMFCAIbAQULCQgH
AwUVCgkICwUWAgMBAAIeAQIXgAAKCRDvBllSZ0aqks9XD/4p8jcHEGGvzNsO9Aa4
UOXAFMPoc3XI46H6SGf7n1GOg8ZdtHQt9K/5KXMaWx1L4DGzcFrmSZjo71aZqJW1
3fjb/+rTCjm3eYyTVAOMflQhvamPPxPWnsQd3XL6Iiu0VrczNfy1yh2W3EiV5tWR
oX6eKuCuFSCXugOdSPp5TelSRL3X2htyfRjT1YS14s49ANNBeUkDjQNQmwdIkC5i
iOirjyWYhlO44L2a2GeBJc9TdR6hN2Vfp1p3DemfYIeURGo2u9d25cxo9fANLnaM
XVzaC7DgXGfOEzDEAJFjEMMomtrVKZZtsYN1w7O1BlPqmVOlP+CvS8ui5WvStN6c
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
gQGubTXSHtTda342nVz1NL2EAA==
=IwO6
-----END PGP PUBLIC KEY BLOCK-----
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ set(DBB-FIRMWARE-SOURCES
flash.c
touch.c
ecdh.c
json.c
)

if(USE_SECP256K1_LIB)
Expand Down
Loading

0 comments on commit ed2bf1d

Please sign in to comment.