aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #749Riccardo Spagni2016-03-2515-594/+2909
* Merge pull request #761Riccardo Spagni2016-03-2515-2909/+594
|\
| * Revert "Merge pull request #749"Riccardo Spagni2016-03-2515-2909/+594
|/
* Merge pull request #756Riccardo Spagni2016-03-254-10/+192
|\
| * wallet: add a --generate-from-json flagmoneromooo-monero2016-03-254-10/+192
* | Merge pull request #749Riccardo Spagni2016-03-2515-594/+2909
|\ \
| * | Update BlockchainDB documentationThomas Winget2016-03-241-155/+937
| * | Change Doxyfile, Blockchain not blockchain_storageThomas Winget2016-03-241-3/+3
| * | remove defunct code from cryptonote::coreThomas Winget2016-03-242-22/+0
| * | cryptonote::core doxygen documentationThomas Winget2016-03-242-26/+617
| * | doxygen documentation for difficulty functionsThomas Winget2016-03-242-2/+16
| * | Move checkpoint functions into checkpoints classThomas Winget2016-03-249-359/+327
| * | doxygen documentation for checkpoints.{h,cpp}Thomas Winget2016-03-222-6/+99
| * | Remove unnecessary or defunct codeThomas Winget2016-03-222-22/+0
| * | doxygen include private and static membersThomas Winget2016-03-221-4/+4
| * | Updated documentation for blockchain.*Thomas Winget2016-03-222-14/+925
| |/
* | Merge pull request #748Riccardo Spagni2016-03-251-1/+1
|\ \ | |/ |/|
| * blockchain: fix partial block reward detectionmoneromooo-monero2016-03-221-1/+1
* | Merge pull request #746v0.9.3Riccardo Spagni2016-03-211-1/+1
|\ \
| * | update version numberRiccardo Spagni2016-03-211-1/+1
|/ /
* | Merge pull request #745Riccardo Spagni2016-03-211-1/+1
|\ \
| * | core_tests: fix compile failure with GCC 4.8.4moneromooo-monero2016-03-211-1/+1
| |/
* | Merge pull request #744Riccardo Spagni2016-03-2115-73/+176
|\ \ | |/ |/|
| * fix building on FreeBSDRiccardo Spagni2016-03-212-4/+1
| * bump miniupnpc API version numberRiccardo Spagni2016-03-211-1/+1
| * update miniupnpcRiccardo Spagni2016-03-2113-68/+174
|/
* Merge pull request #743Riccardo Spagni2016-03-211-1/+1
|\
| * also maybe do the block height this time, you know, just so that it actually ...Riccardo Spagni2016-03-211-1/+1
* | Merge pull request #742Riccardo Spagni2016-03-211-1/+1
|\|
| * also update the timestamp for the hard forkRiccardo Spagni2016-03-211-1/+1
* | Merge pull request #741Riccardo Spagni2016-03-213-31/+47
|\|
| * set fork date for September, add hyc's GPG key, remove aabramov'sRiccardo Spagni2016-03-213-31/+47
* | Merge pull request #740Riccardo Spagni2016-03-2143-259/+63
|\ \ | |/ |/|
| * Revert "Print stack trace upon exceptions"moneromooo-monero2016-03-2143-259/+63
|/
* Merge pull request #738Riccardo Spagni2016-03-201-40/+47
|\
| * db_lmdb: include the error codes from lmdb api in error logsmoneromooo-monero2016-03-201-40/+47
* | Merge pull request #737Riccardo Spagni2016-03-201-1/+1
|\ \
| * | cryptonote_protocol: clarify height wordingmoneromooo-monero2016-03-201-1/+1
| |/
* | Merge pull request #736Riccardo Spagni2016-03-201-0/+8
|\ \
| * | epee: fix potential hang on exitmoneromooo-monero2016-03-201-0/+8
| |/
* | Merge pull request #735Riccardo Spagni2016-03-201-1/+1
|\ \
| * | rpc: fix print_tx in command line modemoneromooo-monero2016-03-191-1/+1
| |/
* | Merge pull request #734Riccardo Spagni2016-03-201-42/+54
|\ \
| * | simplewallet: make --password-file work in RPC modemoneromooo-monero2016-03-191-42/+54
| |/
* | Merge pull request #733Riccardo Spagni2016-03-2043-63/+259
|\ \ | |/ |/|
| * Print stack trace upon exceptionsmoneromooo-monero2016-03-1943-63/+259
|/
* Merge pull request #732Riccardo Spagni2016-03-192-2/+4
|\
| * Reduce log noiseHoward Chu2016-03-191-2/+3
| * Fix issue #706Howard Chu2016-03-191-0/+1
* | Merge pull request #731Riccardo Spagni2016-03-191-1/+1
|\ \ | |/ |/|