Commit 7cbf030c authored by Mike McDonald's avatar Mike McDonald
Browse files

merge upstream

parents 5bc01418 9e8bbbcc
# Monero
Copyright (c) 2014-2015, The Monero Project
Copyright (c) 2014-2016, The Monero Project
## Development Resources
......@@ -33,7 +33,7 @@ Multiple language support will be added soon.
## License
Copyright (c) 2014-2015, The Monero Project
Copyright (c) 2014-2016, The Monero Project
All rights reserved.
......
- platform: Windows, 64-bit
icon: windows.svg
url: win64
hash: 5acf4eb02d5c24ddb3f917e22f6c24c962e988aa
version: 0.9.0.0
hash: 303840d7fb997b2f1efc280fd19ba84003ecff85
version: 0.9.1.0
tag: Hydrogen Helix
blockchain: win
......@@ -10,23 +10,23 @@
icon: windows.svg
url: win32
hash: none
version: 0.9.0.0
version: 0.9.1.0
tag: Hydrogen Helix
blockchain: win
- platform: Mac OS X, 64-bit
icon: apple.svg
url: mac64
hash: b3c311a0ceb9547d91cf01c2a511d792a39c2095
version: 0.9.0.0
hash: d6c776878fd3d47f149fc9be4e76cf2d03d5a725
version: 0.9.1.0
tag: Hydrogen Helix
blockchain: mac
- platform: Linux, 64-bit
icon: linux.svg
url: linux64
hash: 183ac12608c64d87eb62db665ff04fc2ca7fcdb0
version: 0.9.0.0
hash: 4149de91c10b56ff091070acca80d233fbd5a797
version: 0.9.1.0
tag: Hydrogen Helix
blockchain: linux
......@@ -42,7 +42,7 @@
icon: arm.svg
url: arm
hash: none
version: 0.9.0.0
version: 0.9.1.0
tag: Hydrogen Helix
blockchain: arm
......
......@@ -59,7 +59,7 @@ index:
private: Private
secure: Secure
untraceable: Untraceable
private_text: "Monero uses a cryptographically sound system that allows you to send and receive funds without your @transactions being publically visible on the @blockchain (the distributed ledger of transactions). This ensures that your purchases, receipts, and other transfers remain private by default."
private_text: "Monero uses a cryptographically sound system that allows you to send and receive funds without your @transactions being publicly visible on the @blockchain (the distributed ledger of transactions). This ensures that your purchases, receipts, and other transfers remain private by default."
untraceable_text: "By taking advantage of @ring-signatures, a special property of certain types of cryptography, Monero enables untraceable transactions. This means it's ambiguous which funds have been spent, and thus extremely unlikely that a transaction could be linked to particular user."
secure_text: "Using the power of a distributed peer-to-peer @consensus network, every transaction is cryptographically secured. Individual @accounts have a 25 word @mnemonic-seed displayed when created, which can be written down to back up the @account. Account files are encrypted with a passphrase to ensure they are worthless if stolen."
how_do_i_1: "How do I "
......
......@@ -6,20 +6,20 @@ This GPG-signed message exists to confirm the SHA sums on Monero binaries.
Please verify the signature against the signature for fluffypony in the
source code repository (/utils/gpg_keys).
monero.win.x64.v0-9-0-0.zip: 5acf4eb02d5c24ddb3f917e22f6c24c962e988aa
monero.mac.x64.v0-9-0-0.tar.bz2: b3c311a0ceb9547d91cf01c2a511d792a39c2095
monero.linux.x64.v0-9-0-0b.tar.bz2: 183ac12608c64d87eb62db665ff04fc2ca7fcdb0
monero.win.x64.v0-9-1-0.zip: 303840d7fb997b2f1efc280fd19ba84003ecff85
monero.mac.x64.v0-9-1-0.tar.bz2: d6c776878fd3d47f149fc9be4e76cf2d03d5a725
monero.linux.x64.v0-9-1-0.tar.bz2: 4149de91c10b56ff091070acca80d233fbd5a797
monero.freebsd.x64.v0-8-6-6.tar.bz: 9fd0005b697e146a26a0bf9e3cd0c89b978f7fbd
Riccardo "fluffypony" Spagni
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEcBAEBAgAGBQJWhr6gAAoJEFVDLfMczU/N9KcH/RwrJleYYcLUZxqmSH6xiPDN
IQYIum6Uz95xOvoconOMXjV8QDSkcW1stTXEDI58Q+kuu68xp2aURIw/wXrH3TkC
cOa83AwVWJdJka4V0TLrWDoAerBdg5cFgLYreH/HzwLrRFHPOagfvQjzbLkTSW1w
ak8Kof3GtJlzEcH/jcwBpa+MAFq73JAegTVDsO6Wod7qm+uHZXiVAk+8xmzpxaWn
Kh3fOD0NnXXvCdMHsE4wBDFOWjnK26I/qsPUWzv2xM7t87B+pb8GS5mjr3hYleuI
oWWvHEV0lq9eL9caCERZrI7obtEpeANgButj3KFJHGyZqWxl/ZD4YHOcQrKR3Tg=
=Eltb
iQEcBAEBAgAGBQJWmTisAAoJEFVDLfMczU/NDQMIAKKYY2/NI5LH4COMIAXRf02x
TTa+veq8job7jnyVI3C+kl2Wtws026CsUHy1TQNrU5krGs5FA77RFrozIIn4Ca7e
su3u0K14hdO8d+bfiPf3n3eh+CTa5/ihbKVf8BannwjI9tyYzjrLSl49rfftdaRP
vpCVyqbApkNzntiIyG/SypGEW9G1b9rQU4RGE0GK836zf4Pu2jz3ZD6Clbc+gGri
/PmLSYBulkcbQ/7TW8Sl0sn+Lj1WF9duVqS/sZiXdws2sT++Lj4LzmNMGDE4SMLe
eYWEu6FrgpmRzLAhqa3pWAOC12bmrINvU8W2/oAXMIPUdyTb3IDJtWhm2KGqJEo=
=3WkU
-----END PGP SIGNATURE-----
\ No newline at end of file
......@@ -15,15 +15,15 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
### Crypto-Kingdom
An online role playing game with ingame trading system based on cryptocurrency culture. Has monero as native currency.
Visit http://cryptokingdom.me for more info
Visit [http://cryptokingdom.me](http://cryptokingdom.me) for more info.
### Monerodice
A Monero gambling site.
Visit http://www.monerodice.net for more info
Visit [http://www.monerodice.net](http://www.monerodice.net) for more info.
### XMR.TO
A website designed to pay any BTC address using monero.
Visit http://www.xmr.to for more info
Visit [http://www.xmr.to](http://www.xmr.to) for more info.
......
......@@ -22,4 +22,4 @@ These tools can be used to gain information about the Monero network or your tra
###[Monero offline wallet generator](http://moneroaddress.org/)
###[Monero network mixin statistics](http://moneroblocks.eu/stats)
\ No newline at end of file
###[Monero network mixin statistics](http://moneroblocks.info/stats)
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment