Riccardo Spagni
64ebeb5aa5
Merge pull request #2182
...
2fac03e651efb217
2017-08-07 15:06:59 +02:00
Riccardo Spagni
04591af7fd
Merge pull request #2153
...
35d68b2c
2017-08-07 14:49:15 +02:00
Riccardo Spagni
f6ee93e214
Merge pull request #2148
...
125f823b
2017-08-07 14:48:38 +02:00
Riccardo Spagni
ce52d94cb7
Merge pull request #2147
...
94717021
2017-08-07 14:47:43 +02:00
Riccardo Spagni
159a6e9669
Merge pull request #2132
...
464afd4d
2017-08-07 14:46:26 +02:00
moneromooo-monero
4d87304683
blockchain: add testnet v6 fork height at 971400
2017-08-07 11:34:59 +01:00
moneromooo-monero
158c3ecff3
core: thread most of handle_incoming_tx
2017-08-07 09:33:20 +01:00
moneromooo-monero
f57ee382b8
cryptonote_protocol: retry stale spans early
...
Connections can be dropped by the net_node layer,
unbeknownst to cryptonote_protocol, which would then
not flush any spans scheduled to that connection,
which would cause it to be only downloaded again
once it becomes the next span (possibly after a small
delay if it had been requested less than 5 seconds
ago).
2017-08-07 09:33:17 +01:00
moneromooo-monero
90df52e12f
cryptonote_protocol: light cleanup
2017-08-07 09:33:14 +01:00
moneromooo-monero
84e23156ac
cryptonote_protocol: avoid spurious SYNCHRONIZED OK messages
2017-08-07 09:33:09 +01:00
moneromooo-monero
5be43fcdba
cryptonote_protocol_handler: sync speedup
...
A block queue is now placed between block download and
block processing. Blocks are now requested only from one
peer (unless starved).
Includes a new sync_info coommand.
2017-08-07 09:33:04 +01:00
moneromooo-monero
74597bd15a
wallet2: improve refresh height determination
...
As reported by jaquee, the calculation could underflow for very
low heights.
Additionally, we now use the target height too.
2017-08-06 16:56:51 +01:00
moneromooo-monero
042b86c473
simplewallet: do not ask wallet filename twice when restoring
...
It's annoying and pointless (especially as it's the only thing
where the user is asked twice)
2017-08-06 12:28:00 +01:00
Erik de Castro Lopo
8bbed27573
simplewallet: Be explicit about secret keys
...
Previously, the wallet just asked for "Spend key" and "View key" but
now it specifies that these should be the secret versions of these
keys.
2017-08-06 08:37:18 +10:00
Jaquee
e31aac80e5
walletAPI: add getRefreshFromBlockHeight()
2017-08-05 19:23:55 +02:00
Jaquee
48c0cb1ba6
wallet api: pause refresh while commiting tx
2017-08-05 19:21:23 +02:00
moneromooo-monero
9707998a08
wallet2: clear some missing containers in clear()
2017-08-05 18:09:31 +01:00
Jaquee
67ce4910bc
wallet2: store testnet bool in keys file
2017-08-05 17:23:47 +02:00
moneromooo-monero
0c57df9770
wallet2: fix temporarily missing incoming tx when being mined
...
When scanning the txpool without having first updated the
blockchain, the tx would be seen as neither in the txpool
nor the chain, and removed, so it'd only reappear once the
chain is refreshed, and the tx seen in a block.
2017-08-05 12:36:03 +01:00
moneromooo-monero
f4f7eeba80
blockchain: log more info when we reject an orphan
...
We want to know what happened when a block is wrongly rejected
2017-08-04 23:26:55 +01:00
moneromooo-monero
16a5534704
simplewallet: show payment ids on sign_transfer
...
Integrated addresses are shown when an encrypted payment id is used
2017-08-04 19:36:02 +01:00
moneromooo-monero
71e2876033
debug_utilities: only build for debug builds
2017-08-04 14:45:43 +01:00
moneromooo-monero
55e150ff8a
debug_utilities: new object-sizes debug tool
...
It prints the size of various interesting types, to make it
easier to match leaks to possible leaked object types
2017-08-04 14:45:38 +01:00
Jaquee
a839a6fa8a
Wallet API: add tx unlock time
2017-08-03 21:37:45 +02:00
moneromooo-monero
fbaf5375c3
cn_deserialize: move to new debug_utilities subdirectory
2017-08-03 16:20:40 +01:00
moneromooo-monero
d732c73e71
blockchain: remove a few unused variables
2017-08-03 11:26:55 +01:00
m2049r
ad4649ac81
Enable verifying wallet password with having to load wallet.
2017-08-03 01:45:45 +02:00
Guillaume LE VAILLANT
c8640a3d74
difficulty: fix misleading comment
2017-08-02 23:59:48 +02:00
moneromooo-monero
328bebbe4b
daemon: some more include cleanup
2017-08-02 22:43:38 +01:00
moneromooo-monero
1c9196b0c5
cryptonote_protocol: fix days behind calc on testnet
2017-08-02 22:34:02 +01:00
moneromooo-monero
b7d6ec8364
simplewallet: add (out of sync) or (no daemon) markers in the prompt
...
Should help people who don't realize why they haven't seen their
monero yet.
2017-08-02 14:44:42 +01:00
moneromooo-monero
fa23a5006d
wallet2: add a is_synced function
2017-08-02 14:44:19 +01:00
moneromooo-monero
f1307bbd7b
node_rpc_proxy: add a proxy for target height
2017-08-02 14:43:47 +01:00
moneromooo-monero
c97d1bd3d4
wallet: return unlock_time in get_transfers
...
also show it in simplewallet's show_transfer
2017-08-02 10:15:27 +01:00
m2049r
600353e2b2
fix wallet callback signatures
2017-08-02 01:23:53 +02:00
moneromooo-monero
41f935ddb2
network_throttle: remove unneeded heap allocations
...
This will keep leak traces less noisy, as those were one off
allocations that were technically leaking.
2017-08-01 18:47:05 +01:00
moneromooo-monero
c6ba7d110f
p2p: move m_in_timedsync from connection_context to p2p_connection_context
...
It's got no place in the base class as it's P2P specific field
2017-08-01 18:41:57 +01:00
moneromooo-monero
5d4ef719b9
core: speed up output index unique set calculation
...
A sort+uniq step was done for every tx in a 200 block chunk,
causing a lot of repeated scanning as the size of the offset
map got larger with every added tx. We now do the step only
once at the end of the loop.
Doing it this way potentially uses more memory, but testing
shows that it's currently only about 2% more.
2017-08-01 14:06:12 +01:00
moneromooo-monero
19d7f568ce
perf_timer: allow profiling more granular than millisecond
2017-08-01 14:05:20 +01:00
moneromooo-monero
214fd81e93
some include cleanup
2017-07-31 16:36:52 +01:00
moneromooo-monero
87b5ede908
miner: fix ignoring battery from command line
2017-07-31 08:36:57 +01:00
moneromooo-monero
5dd722beaa
core: add a message when loading checkpoints at init time
...
This uses DNS, which can take a while, so it's useful to know
this is the culprit when loading pauses
2017-07-31 06:43:13 +01:00
moneromooo-monero
14ec6ed80d
tx_pool: remove obsolete unused m_config_folder field
2017-07-30 12:03:43 +01:00
moneromooo-monero
5d91b26c0f
blockchain: skip checking tx semantics in embedded block hash range
...
If the txes are bad, this'll be picked up by the block hash mismatch
since the tx merkle root is part of the block hash.
2017-07-30 09:48:00 +01:00
moneromooo-monero
d37e8f8868
daemon: add average seconds per block in bc_dyn_stats
2017-07-29 18:43:50 +01:00
moneromooo-monero
878205f143
core: fix lock ordering bug at init time
2017-07-29 12:54:02 +01:00
JollyMort
02f13d6cdf
Fix handling of strings & simplify summation of spendkeys
2017-07-29 13:49:12 +02:00
moneromooo-monero
04ebfbfefa
p2p: close connections when exiting
...
This ensures they don't leak if they were in the middle of an
async operation.
2017-07-29 10:04:36 +01:00
JollyMort
40fc9d7b68
Add option to join multisig wallet pieces together
...
Asks user for all the data required to merge secret keys from multisig wallets into one master wallet, which then gets full control of the multisig wallet. The resulting wallet will be the same as any other regular wallet.
2017-07-29 02:36:21 +02:00
moneromooo-monero
9a10148c01
p2p: fix thread leak
2017-07-28 22:23:05 +01:00
moneromooo-monero
d8becf2ee1
blockchain: fix cryptonight buffer leak on exit
2017-07-28 10:19:17 +01:00
moneromooo-monero
91aa90fc79
blockchain: ensure all blocks get their longhash precalculated
...
If the number of blocks to check was not a multiple of the
number of preparation threads, the last few blocks would
not be included in the threaded long hash calculation.
Those would still get calculated when the block gets added
to the chain, however, so this was only a tiny performance
hit, rather than a security bug.
2017-07-27 18:18:49 +01:00
moneromooo-monero
ff4bcaed81
blockchain: pass correct height to get_block_longhash
2017-07-27 18:18:20 +01:00
moneromooo-monero
06aea2cf0a
move get_proof_of_trust_hash from util.h to p2p_protocol_defs.h
...
This avoids having to include p2p_protocol_defs.h in util.h,
as util.h is used a lot, and p2p_protocol_defs.h includes
a lot of other things that most users don't need.
2017-07-27 15:46:47 +01:00
Erik de Castro Lopo
525975acc4
wallet-cli: Minor improvement to help output
2017-07-27 20:36:28 +10:00
moneromooo-monero
cb0b559451
Move OpenAlias console input back from libs
...
Library code should definitely not ask for console input unless
it's clearly an input function. Delegating the user interaction
part to the caller means it can now be used by a GUI, or have a
decision algorithm better adapted to a particular caller.
2017-07-27 11:30:13 +01:00
moneromooo-monero
dc0b312f8a
wallet_rpc_server: optionally return tx blobs on transfer calls
...
also add do_not_relay flag to them, so it now becomes possible
to create a tx without sending it yet
2017-07-26 10:33:04 +01:00
moneromooo-monero
340feedee2
core: randomly shuffle outputs
...
They used to be sorted by amount, which was fine before rct,
but is now suboptimal, since amounts are not known anymore.
In particular, it would give a recipient knowledge of whether
change was higher or lower than the amount received.
2017-07-25 18:57:57 +01:00
rbrunner7
f1b76c8424
cryptonote_protocol: Set send_idle_time in connection_info correctly
2017-07-24 18:58:39 +02:00
moneromooo-monero
53af9768ce
blockchain: one off warning when seeing a block with unknown version
2017-07-24 15:25:46 +01:00
moneromooo-monero
58f3fc68e4
Make msgwriter logs go to file only
...
This was the case for monero-wallet-cli already, but not for
monerod, which was making it pretty spammy as it was duplicating
intended output. Since my original intent was to ensure logs
included command output for debugging, this achieves both.
2017-07-24 10:34:47 +01:00
JollyMort
23909bb04d
Make successful transfer log message more informative
...
"Payment successfully sent" can be misleading if the TX isn't confirmed and drops from TX-pool.
2017-07-22 23:35:53 +02:00
moneromooo-monero
a5031a7d02
core: forbid duplicate ring members from v6
...
This avoids someone adding what amounts to mixin 0 rings in
practice, as there is no other good reason to allow this.
2017-07-22 12:33:12 +01:00
Erik de Castro Lopo
51efb21713
daemon: Add ability to write a PID file
...
The PID file will only be written if the daemon is called with the
`--detach` command line argument and a `--pidfile /some/file/path`
argument.
2017-07-22 08:34:56 +10:00
Riccardo Spagni
ab594cfee9
Merge pull request #2159
...
6955976b
2017-07-19 11:52:27 +02:00
Riccardo Spagni
c0f155d3a0
Merge pull request #2170
...
c3bb6bec
2017-07-19 11:51:35 +02:00
Riccardo Spagni
630cc0f9ca
Merge pull request #2169
...
f5f985c0
2017-07-19 11:51:09 +02:00
Riccardo Spagni
fed3430b70
Merge pull request #2166
...
33d17c37
2017-07-19 11:50:38 +02:00
Riccardo Spagni
921ebdce45
Merge pull request #2165
...
8db68a57Fix #2164 histogram output (Howard Chu)
2017-07-19 11:50:14 +02:00
Riccardo Spagni
42fc89b672
Merge pull request #2142
...
02d66db40722aea3
2017-07-19 11:49:42 +02:00
Riccardo Spagni
999d4d83e9
Merge pull request #2135
...
5cea3552
2017-07-19 11:49:09 +02:00
moneromooo-monero
c3bb6becd9
daemon: fix status in command line mode if using restricted rpc
2017-07-13 10:17:57 +01:00
moneromooo-monero
f5f985c018
miner: fix background mining options parsing
...
They were set as uint8_t, which boost was apparently treating
as a character type, rather than a numeric type
2017-07-12 11:22:50 +01:00
Howard Chu
33d17c37e8
Don't hardcode /tmp
2017-07-11 12:38:51 +01:00
Howard Chu
8db68a57f5
Fix #2164 histogram output
...
When there are more than 50txs, the timestamp for the last
bin was printed incorrectly. Subtracting "now" was omitted by mistake
in 3fc22e7b78
2017-07-10 15:51:03 +01:00
Jethro Grassie
6955976b2d
Add various readline related fixes
...
- Add missing unbind key
- Fix colored messages
- Add command completion
- Preserve last command input
- Fix cursor position issues
- Fix trailing whitespace in commands
- Synchronize set_prompt
2017-07-09 09:50:04 -04:00
Ryan Mehta
94717021ef
fix on_battery_power for linux
...
fix ac/battery linux
2017-07-06 10:03:55 -07:00
Erik de Castro Lopo
35d68b2c6d
Fix spelling errors
2017-07-05 17:53:16 +10:00
moneroexamples
125f823bda
Add on_get_alt_blocks_hashes RPC call
2017-07-04 12:32:44 +08:00
Riccardo Spagni
218f1a1d69
Merge pull request #2125
...
f98bf48b
2017-07-03 12:30:46 +02:00
Riccardo Spagni
44e4bbd15c
Merge pull request #2124
...
3b599d2bd3bb72ff32754784
2017-07-03 12:30:16 +02:00
Riccardo Spagni
645c898e2d
Merge pull request #2121
...
5a09d79cFix #2120 : return per-tx amount in transfer_split RPC call. (binaryFate)
2017-07-03 12:28:56 +02:00
Riccardo Spagni
b66420e54d
Merge pull request #2114
...
b592cb3f
2017-07-03 12:27:52 +02:00
Riccardo Spagni
7995dcff94
Merge pull request #2112
...
76043b17#2117 ) (moneromooo-monero)
a73a42a6#2117 ) (moneromooo-monero)
be9d4f04
2017-07-03 12:27:14 +02:00
Riccardo Spagni
bbdbccfba0
Merge pull request #2110
...
7d2c89b63255887f
2017-07-03 12:26:02 +02:00
Riccardo Spagni
c577bc8762
Merge pull request #2107
...
bdab3436
2017-07-03 12:24:16 +02:00
Riccardo Spagni
9e1ded69dd
Merge pull request #2106
...
bb708ab8
2017-07-03 12:23:39 +02:00
moneromooo-monero
02d66db4b4
tx_pool: initialize padding in txpool meta structure
2017-07-02 18:45:29 +01:00
moneromooo-monero
0722aea3df
cryptonote_core: initialize checkpoint flag
2017-07-02 18:45:25 +01:00
moneromooo-monero
5cea355232
simplewallet: lock idle scope when sweeping
...
This ensures the chain and related structures can't change
while we're using them
2017-06-30 09:33:37 +01:00
Howard Chu
464afd4d2d
Ensure DNSResolver destructor runs on exit
...
Plugs a noisy but benign memory leak
2017-06-28 22:21:06 +01:00
moneromooo-monero
8f96cfc20a
Remove typeid use in network_address
...
Since I had to add an ID to the derived classes anyway,
this can be used instead. This removes an apparently
pointless warning from CLANG too.
2017-06-28 09:11:24 +01:00
binaryFate
f98bf48b1d
Minor cleanup: tab vs. space + logs messages
2017-06-26 12:30:14 +02:00
binaryFate
5a09d79caf
Fix #2120 : return per-tx amount in transfer_split RPC call.
2017-06-26 12:22:12 +02:00
moneromooo-monero
3b599d2b7e
wallet2: get current height from the daemon on creation
...
Use current time to estimate current height only if the daemon
cannot be queried.
2017-06-26 08:11:14 +01:00
moneromooo-monero
d3bb72fff1
wallet2: fix infinite loop on future refresh height
...
If the refresh height is in the future, the current code will
loop till the actual height reaches this. Fix it by bailing out
if we receive only three hashes, which is what we set in the
call parameters.
2017-06-26 06:58:37 +01:00
moneromooo-monero
32754784db
wallet: fix refresh_from_height setting on new wallet
...
The previous patch was based on a wrong premise (that the
daemon height was 0 because the daemon calling code wasn't
yet initialized). In fact, current height approximation
was not setup for testnet. Fix this.
2017-06-26 06:58:31 +01:00
Jethro Grassie
be9d4f0411
Fix multiline wallet cli output with readline
...
monero-wallet-cli commands which have multine output sometimes causes
issues with the readline support. This patch fixes show_transfers,
payments and incoming_transfers.
2017-06-25 10:48:02 -04:00
Riccardo Spagni
50d8f73f06
Merge pull request #2091
...
e4da88a2
2017-06-24 12:43:28 +02:00
Riccardo Spagni
f31b89012d
Merge pull request #2073
...
07c4276ccf3a376c340830de
2017-06-24 12:41:09 +02:00
Mike C
b592cb3f0a
Fix on_transfer RPC incorrect logging info
2017-06-23 11:54:10 -04:00
Guillaume LE VAILLANT
3255887f5e
simplewallet: typo fixes
2017-06-23 14:04:44 +02:00
Julien Klepatch
bdab3436d3
Fix mismatch of parameter name between header file and implementation for set_user_options()
2017-06-23 05:16:11 +08:00
moneromooo-monero
bb708ab8c3
electrum-words: fix seed mistakenly thought to be old style
...
It'd see "empty" words due to extraneous spaces
2017-06-22 16:47:07 +01:00
stoffu
d5f1cef73c
simplewallet: removed unneeded LOCK_IDLE_SCOPE() from check_tx_key()
2017-06-22 18:11:20 +09:00
stoffu
8df918f8c7
simplewallet: replace assert(m_wallet) with error out
2017-06-22 18:11:18 +09:00
stoffu
8da82256d4
crypto: moved boost::lock_guard into a smaller scope
2017-06-22 18:11:15 +09:00
stoffu
c9e0e944e9
Signature proving payment to destination by only revealing key derivation, not the actual tx secret key
2017-06-22 18:11:13 +09:00
Riccardo Spagni
ae8841f2ab
Merge pull request #2087
...
4e13ab30
2017-06-18 17:36:55 +02:00
Riccardo Spagni
78f965a9e2
Merge pull request #2082
...
235df7f4
2017-06-18 17:36:12 +02:00
Riccardo Spagni
91e1a7e3e2
Merge pull request #2081
...
b2319a03
2017-06-18 17:34:41 +02:00
Riccardo Spagni
f973a2f81a
Merge pull request #2078
...
1dd52415Fix #1991 asm multiply again (Howard Chu)
2017-06-18 17:32:03 +02:00
Riccardo Spagni
fb7d6db051
Merge pull request #2076
...
ac0714dc
2017-06-18 17:27:52 +02:00
Riccardo Spagni
ae5f7c71d7
Merge pull request #2074
...
e1f3dfcc
2017-06-18 17:26:08 +02:00
Riccardo Spagni
88b7cb9bda
Merge pull request #2070
...
71f8249a
2017-06-18 16:43:35 +02:00
Riccardo Spagni
ace1440b65
Merge pull request #2066
...
3fc22e7bd09620b0
2017-06-18 16:41:42 +02:00
Riccardo Spagni
a0174ad534
Merge pull request #2064
...
6fc2dc39
2017-06-18 16:40:52 +02:00
jethro
e1f3dfccc8
Add readline support to cli
...
This PR adds readline support to the daemon and monero-wallet-cli. Only
GNU readline is supported (e.g. not libedit) and there are cmake checks
to ensure this.
There is a cmake variable, Readline_ROOT_DIR that can specify a
directory to find readline, otherwise some default paths are searched.
There is also a cmake option, USE_READLINE, that defaults to ON. If set
to ON, if readline is not found, the build continues but without
readline support.
One negative side effect of using readline is that the color prompt in
the wallet-cli now has no color and just uses terminal default. I know
how to fix this but it's quite a big change so will tackle another time.
2017-06-18 10:08:37 -04:00
Riccardo Spagni
421a6d0340
Merge pull request #2055
...
1b75ad91
2017-06-18 14:24:48 +02:00
Riccardo Spagni
a237f90c5b
Merge pull request #2052
...
072102cf
2017-06-18 14:23:59 +02:00
Julien Klepatch
e4da88a223
Fixed typo in rpc/core_rpc_server.cpp
2017-06-18 16:12:54 +08:00
Howard Chu
07c4276cbe
Don't issue a new timedsync while one is already in progress
...
A timedsync is issued every minute on a connection, but the input
tineout is 2 minutes. This means a new sync request could be issued
while a slow sync request was already in progress. The additional
request will further clog the network on a slow connection, and
cause a premature timeout.
2017-06-15 16:54:03 +01:00
moneromooo-monero
4e13ab306a
wallet_api: fix missing transaction parameter in callback
...
It was unused, so harmless
Reported by erikd on IRC
2017-06-13 19:34:51 +01:00
moneromooo-monero
235df7f484
blockchain_db: add a txpool tx getter which returns existence
...
Avoids exception spam for the "nope, not found" case
2017-06-11 15:36:48 +01:00
moneromooo-monero
b2319a03a6
simplewallet: new command to generate a random payment id
...
This is trivial, but often requested, and possibly hard to do
in Windows. That makes it more user friendly.
2017-06-10 10:08:55 +01:00
Howard Chu
1dd524151d
Fix #1991 asm multiply again
...
Tweak temp variables and constraints. Was working before if not inlined
but newer gcc tends to inline it.
2017-06-08 21:46:40 +01:00
jethro
1b75ad91aa
Add OSX background mining
...
Implements miner::get_system_times, miner::get_process_time and
miner::on_battery_power for OSX so that background mining works on OSX.
2017-06-08 09:26:09 -04:00
Michael Shick
ac0714dcd7
add simplewallet --generate-new-wallet arg checks
...
Add fail-fast paths that reduce frustration around the misuse of
--wallet-file combined with --restore-deterministic-wallet. Flow now
gives more descriptive errors and avoids having users type in their
whole seed before the failure condition is noticed.
2017-06-07 07:46:59 -07:00
Howard Chu
3fc22e7b78
Add histogram to poolstats
2017-06-04 22:48:14 +01:00
Robby Weinberg
71f8249a08
Prevent crash if performing certain actions before wallet is initialized
2017-06-03 19:56:51 -05:00
moneromooo-monero
6fc2dc3927
cryptonote_protocol_handler: fix crash in debug log
2017-06-01 19:42:33 +01:00
Riccardo Spagni
ea286d1a14
Merge pull request #2058
...
6bcd3b2d
2017-06-01 19:42:37 +02:00
Riccardo Spagni
3d397325bf
Merge pull request #2063
...
d17c0fc2
2017-06-01 19:33:43 +02:00
Riccardo Spagni
4a60e9e66e
Merge pull request #2062
...
31417d57
2017-06-01 19:33:17 +02:00
Howard Chu
5414970dcd
Speedup print_pool_stats
...
Since we're just counting txs, there's no reason to deserialize all the blobs.
2017-06-01 17:34:03 +01:00
Howard Chu
d17c0fc2d0
Don't copy blockchain for coinbase_tx_sum
...
Changed Blockchain::for_all_blocks() to for_blocks_range()
Operate on blockchain in-place instead of building a copy first.
2017-06-01 14:14:24 +01:00
moneromooo-monero
31417d57da
tx_pool: add missing blockchain lock in add_tx
2017-05-31 22:55:13 +01:00
schnerchi
6bcd3b2df1
fix get_upper_transaction rename
2017-05-31 12:26:42 +02:00
Riccardo Spagni
8fbbefb8db
Merge pull request #2053
...
05f3dcf7
2017-05-30 21:28:40 +02:00
Riccardo Spagni
f5e65452ce
Merge pull request #2042
...
740bc24c
2017-05-30 21:24:45 +02:00
Riccardo Spagni
a4c13ea092
Merge pull request #2039
...
4b932ff3
2017-05-30 21:24:11 +02:00
Riccardo Spagni
4284f1777d
Merge pull request #2038
...
89e20bb9
2017-05-30 21:23:25 +02:00
Riccardo Spagni
cd13bcb4d2
Merge pull request #2036
...
89b2f306a374a522
2017-05-30 21:23:05 +02:00
Riccardo Spagni
9ea7fbed8a
Merge pull request #2032
...
dd8e3266
2017-05-30 21:21:36 +02:00
Riccardo Spagni
907ce14b18
Merge pull request #2026
...
a5739201
2017-05-30 21:20:39 +02:00
Riccardo Spagni
d621f9e558
Merge pull request #2022
...
e25293473029d0ef
2017-05-30 21:19:00 +02:00
Riccardo Spagni
62cc3b6447
Merge pull request #2021
...
8ac2496c
2017-05-30 21:15:33 +02:00
Riccardo Spagni
024860b49d
Merge pull request #2020
...
6cb1ad1f
2017-05-30 21:14:24 +02:00
Riccardo Spagni
1555e7673d
Merge pull request #2017
...
0a182576391c918d
2017-05-30 21:13:47 +02:00
Riccardo Spagni
545e2b003c
Merge pull request #1982
...
b52abd13
2017-05-30 21:12:44 +02:00
