summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #141v0.8.8.4Riccardo Spagni2014-09-151-1/+6
|\ | | | | | | b92a8b5 fix CMake for multiplatform versioning (Riccardo Spagni)
| * fix CMake for multiplatform versioningRiccardo Spagni2014-09-151-1/+6
| |
* | Merge pull request #140Riccardo Spagni2014-09-151-0/+30
|\| | | | | | | 0214524 added mikezackles / Zachary Michaels gpg key (Riccardo Spagni)
| * added mikezackles / Zachary Michaels gpg keyRiccardo Spagni2014-09-151-0/+30
|/
* Merge pull request #139Riccardo Spagni2014-09-1536-251/+497
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72a80f6 fixed incorrect version reference (Riccardo Spagni) 95a2701 Change testnet prefix (Zachary Michaels) 120c84d Make P2P use the testnet data dir (Zachary Michaels) 2352565 Replace macro with equivalent function call (Zachary Michaels) d033087 Separate testnet address prefix (Zachary Michaels) ee1bacc Add testnet seed nodes (Zachary Michaels) 4a6eb0a Create testnet data dir if necessary (Zachary Michaels) 018e251 Separate testnet default data dir (Zachary Michaels) 3ef7f33 Add descriptions for RPC command line params (Zachary Michaels) 1e38a02 Add testnet genesis tx as output by CN reference (Zachary Michaels) 96eed84 Pass tx and nonce to genesis block constructor (Zachary Michaels) 257077a Separate network id for testnet (Zachary Michaels) 658b669 Separate rpc port for testnet (Zachary Michaels) 98ed9a4 Separate p2p port for testnet (Zachary Michaels) fb4146f Reorganize testnet constants (Zachary Michaels) 79862ad Add testnet constants (Zachary Michaels) 07470fd Add testnet flag (Zachary Michaels) 32004a7 increase ABSTRACT_SERVER_SEND_QUE_MAX_COUNT to a more sane value (Riccardo Spagni) 2c0a87f additional README info on static builds and FreeBSD (Riccardo Spagni)
| * fixed incorrect version referenceRiccardo Spagni2014-09-151-1/+1
| |
| * Change testnet prefixZachary Michaels2014-09-151-2/+2
| |
| * Make P2P use the testnet data dirZachary Michaels2014-09-151-1/+3
| |
| * Replace macro with equivalent function callZachary Michaels2014-09-151-47/+43
| | | | | | | | Also removed useless bool return
| * Separate testnet address prefixZachary Michaels2014-09-1521-69/+126
| |
| * Add testnet seed nodesZachary Michaels2014-09-151-3/+8
| |
| * Create testnet data dir if necessaryZachary Michaels2014-09-151-0/+1
| |
| * Separate testnet default data dirZachary Michaels2014-09-155-31/+44
| |
| * Add descriptions for RPC command line paramsZachary Michaels2014-09-151-3/+9
| |
| * Add testnet genesis tx as output by CN referenceZachary Michaels2014-09-151-1/+1
| |
| * Pass tx and nonce to genesis block constructorZachary Michaels2014-09-155-28/+43
| |
| * Separate network id for testnetZachary Michaels2014-09-152-3/+15
| |
| * Separate rpc port for testnetZachary Michaels2014-09-155-12/+44
| |
| * Separate p2p port for testnetZachary Michaels2014-09-152-5/+23
| |
| * Reorganize testnet constantsZachary Michaels2014-09-1514-80/+68
| |
| * Add testnet constantsZachary Michaels2014-09-151-0/+16
| |
| * Add testnet flagZachary Michaels2014-09-1515-52/+137
| | | | | | | | Source: cryptonotefoundation
| * increase ABSTRACT_SERVER_SEND_QUE_MAX_COUNT to a more sane valueRiccardo Spagni2014-09-151-1/+1
| |
| * additional README info on static builds and FreeBSDRiccardo Spagni2014-09-151-0/+7
| |
* | increase ABSTRACT_SERVER_SEND_QUE_MAX_COUNT to a more sane valueRiccardo Spagni2014-09-151-1/+1
| |
* | additional README info on static builds and FreeBSDRiccardo Spagni2014-09-151-0/+7
|/
* fix logic in tag check, AND -> ORRiccardo Spagni2014-09-151-1/+1
| | | | Signed-off-by: Riccardo Spagni <ric@spagni.net>
* ignore tag check if we haven't pulled tagsRiccardo Spagni2014-09-151-1/+1
| | | | Signed-off-by: Riccardo Spagni <ric@spagni.net>
* Merge branch 'master' of http://github.com/fluffypony/bitmoneroRiccardo Spagni2014-09-150-0/+0
|\
| * new Makefile target: release-staticRiccardo Spagni2014-09-151-0/+4
| |
* | new Makefile target: release-staticRiccardo Spagni2014-09-152-1/+5
|/
* FreeBSD static linking fixesRiccardo Spagni2014-09-151-3/+3
|
* Merge branch 'master' of http://github.com/fluffypony/bitmoneroRiccardo Spagni2014-09-140-0/+0
|\
| * add gpg pubkeys to start enforcing signed commitsRiccardo Spagni2014-09-131-0/+50
| |
* | add gpg pubkeys to start enforcing signed commitsRiccardo Spagni2014-09-141-0/+50
| |
* | Merge pull request #136Riccardo Spagni2014-09-133-46/+49
|\ \ | | | | | | | | | | | | | | | bb2b606 fix incorrect error message (obvious cut and paste bug from upstream) (iamsmooth) 6b77e83 Change wallet to not try to extract tx public key when tx has no outputs (fixes 202612 tx format messages and is otherwise correct) (iamsmooth) 08205f0 output rng fix from boolberry (iamsmooth)
| * | fix incorrect error message (obvious cut and paste bug from upstream)iamsmooth2014-09-131-1/+1
| | |
| * | Change wallet to not try to extract tx public key when tx has no outputs ↵iamsmooth2014-09-131-43/+47
| | | | | | | | | | | | (fixes 202612 tx format messages and is otherwise correct)
| * | output rng fix from boolberryiamsmooth2014-09-121-2/+1
| | |
* | | Merge pull request #133 from fluffypony/masterRiccardo Spagni2014-09-121-1/+1
|\ \ \ | | |/ | |/| fixed cmake variable matching
| * | fixed cmake variable matchingRiccardo Spagni2014-09-121-1/+1
|/ /
* | Merge pull request #132 from fluffypony/masterRiccardo Spagni2014-09-127-42/+38
|\ \ | | | | | | versioning now includes the commit hash, or -final for tagged releases
| * \ Merge branch 'master' of http://github.com/fluffypony/bitmoneroRiccardo Spagni2014-09-120-0/+0
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/daemon/daemon.cpp
| | * | versioning now includes the commit hash, or -final for tagged releasesRiccardo Spagni2014-09-127-37/+38
| | | |
| | * | always check git diffRiccardo Spagni2014-09-121-6/+1
| | |/
| * | versioning now includes the commit hash, or -final for tagged releasesRiccardo Spagni2014-09-127-37/+38
| | |
| * | always check git diffRiccardo Spagni2014-09-121-6/+1
|/ /
* | Merge pull request #129 from Jebes/masterRiccardo Spagni2014-09-126-79/+177
|\ \ | |/ |/| Added documentation to varint.h and util.h
| * HOW DO I ENGLISH?jebes2014-09-111-1/+1
| |
| * mispelled brief, corrected itjebes2014-09-112-14/+14
| |