Commit Graph

4476 Commits

Author SHA1 Message Date
vertoe
a104f2383f Fix windows copyright strings. 2015-02-17 10:53:03 +01:00
snogcel
ac3030cc65 CSS debug override 2015-02-16 20:12:06 -07:00
vertoe
277ed42040 Remove obsolete bitcoin resource files for windows. 2015-02-16 23:22:56 +01:00
vertoe
a179777a0a Rename darkcoin config header. 2015-02-16 23:19:42 +01:00
vertoe
97600bbfba Rename darkcoin resource files for windows. 2015-02-16 23:05:58 +01:00
vertoe
6d60156dce Fix darkcoin resource file. 2015-02-16 22:54:26 +01:00
vertoe
b1170309a4 Rename darkcoin resource file. 2015-02-16 22:43:16 +01:00
vertoe
9b730c7826 Pull translations from transifex. 2015-02-16 22:36:58 +01:00
vertoe
dc149f0e78 Update source translation file. 2015-02-16 22:30:17 +01:00
vertoe
91adbde525 Rename darkcoinstrings file. 2015-02-16 22:28:38 +01:00
crowning2
b7db590168 Initial commit 2015-02-16 22:12:13 +01:00
crowning2
52d58c26c9 Initial commit 2015-02-16 22:01:13 +01:00
crowning2
f66c347cb9 Test 2015-02-16 21:59:11 +01:00
crowning2
4eedb11cf6 Initial commit 2015-02-16 21:52:37 +01:00
evan82
5d94fc5761 Merge pull request #179 from UdjinM6/v0.11.2.x_fix_keypool_progress
(v0.11.2.x) fix %% calculation on keypool generation
2015-02-16 12:54:04 -07:00
evan82
0e2a1d68b3 Merge pull request #181 from crowning-/v0.11.2.x
Edit darkcoin.conf from within the wallet
2015-02-16 12:53:20 -07:00
evan82
70596bf868 Merge pull request #182 from vertoe/devel-0.9
Weekly translations update.
2015-02-16 12:51:35 -07:00
evan82
b861e7ac4c Merge pull request #183 from UdjinM6/v0.11.2.x_activemn_msgs
(v0.11.2.x) fix log output / more notCapableReason-s
2015-02-16 12:51:04 -07:00
evan82
e3df2faa74 Merge pull request #184 from UdjinM6/v0.11.2.x_fix_qt_multiple_recipients
(v0.11.2.x) qt bug multiple recipients are wrongly send as IX
2015-02-16 12:49:09 -07:00
UdjinM6
428d5976c7 Fix payee selectoin on CMasternodePayments::ProcessBlock
1) find exact payment list
2) find active MNs not payment list
3) if none found - pay to the first active MN from payment list counting from its back
2015-02-16 22:37:24 +03:00
vertoe
08d4a91364 Pull translations from transifex. 2015-02-16 09:55:08 +01:00
UdjinM6
2315b9ab28 fix bug where txes with multiple recipients were send from qt as IX while checkbox was not set 2015-02-16 02:42:08 +03:00
UdjinM6
58bcb321d9 fix log output / more notCapableReason-s 2015-02-16 02:01:06 +03:00
crowning-
e7ee887836 Edit configuration file from within wallet (formating + text change) 2015-02-15 16:26:57 +01:00
vertoe
2b5157c6ed Pull translations from transifex. 2015-02-15 16:06:14 +01:00
vertoe
dd5a7163df Pull translations from transifex. 2015-02-15 14:35:52 +01:00
vertoe
1a3586700e Update untranslated strings. 2015-02-15 14:34:56 +01:00
crowning-
0cc5e478bf Edit configuration file from within wallet 2015-02-15 14:33:31 +01:00
crowning-
8e312833ea Edit configuration file from within wallet 2015-02-15 14:33:01 +01:00
crowning-
e4a290dc04 Update guiutil.h 2015-02-15 14:32:19 +01:00
crowning-
dc3f49bad7 Edit configuration file from within wallet 2015-02-15 14:31:51 +01:00
crowning-
1264546def Edit configuration file from within wallet 2015-02-15 14:31:11 +01:00
crowning-
2d703f8010 Edit configuration file from within wallet 2015-02-15 14:30:22 +01:00
UdjinM6
287b357e32 fix %% calculation on keypool generation 2015-02-15 02:23:16 +03:00
evan82
3d004ab819 Merge pull request #178 from vertoe/devel-0.9-upstream
Implement BIP66
2015-02-14 08:14:03 -07:00
vertoe
e2953f8442 merge upstream 0.9 2015-02-14 08:59:11 +01:00
vertoe
2a1d86ff60 Pull translations from transifex. 2015-02-14 08:57:47 +01:00
vertoe
fb6a288fbc merge downstream 0.11.1 2015-02-14 08:50:55 +01:00
vertoe
692b2e05f7 merge upstream 0.9 2015-02-14 08:48:10 +01:00
Evan Duffield
bdbdbf993f fixed log message 2015-02-13 12:53:45 -07:00
Evan Duffield
70c4e0bdee remove safemode checks for masternode payments & IX block enforce 2015-02-13 12:22:58 -07:00
Evan Duffield
b7b2549e56 blockheight should default to current height 2015-02-13 07:55:08 -07:00
Evan Duffield
65aa7db8a2 fixed sync message 2015-02-13 07:43:44 -07:00
Gregory Maxwell
6b4163b972 Sanitize command strings before logging them.
Normally bitcoin core does not display any network originated strings without
 sanitizing or hex encoding.  This wasn't done for strcommand in many places.

This could be used to play havoc with a terminal displaying the logs,
 especially with printtoconsole in use.

Thanks to Evil-Knievel for reporting this issue.

Conflicts:
	src/main.cpp
	src/net.cpp
	src/rpcserver.cpp

Rebased-From: 28d4cff0ed
Github-Pull: #5770
2015-02-13 13:32:39 +01:00
vertoe
57e59353ff Update source translation file. 2015-02-13 09:29:18 +01:00
vertoe
4bed0a31b0 Pull translations from transifex. 2015-02-13 09:27:53 +01:00
vertoe
824cf61c8d merge downstream 0.11.2 2015-02-13 09:26:14 +01:00
vertoe
9dc8c1cf07 merge downstream 0.11.1 2015-02-13 09:25:59 +01:00
evan82
a9ff5617e9 Merge pull request #177 from UdjinM6/v0.11.1.x_fix_gui_performance_issues
V0.11.2.x Performance and UI Fixes Pack
2015-02-12 16:50:17 -07:00
Evan Duffield
5907263729 sign payee for masternode payments 2015-02-12 12:55:14 -07:00
vertoe
d4070bc092 Pull translations >60% from transifex. 2015-02-12 12:01:14 -07:00
vertoe
9dc7008d81 Pull translations from transifex. 2015-02-12 12:01:14 -07:00
vertoe
920ecea2a1 only include translations >80% (now really\!) 2015-02-12 12:01:14 -07:00
vertoe
29722b89ee Pull translations from transifex. 2015-02-12 12:01:14 -07:00
vertoe
5556a22f7a only include translations >90% 2015-02-12 12:01:14 -07:00
vertoe
1fb19ac889 Revert "Fix coinbase maturity"
This reverts commit eafb791d8c.
2015-02-12 12:01:13 -07:00
vertoe
f6986b53f0 Pull translations from transifex. 2015-02-12 12:01:13 -07:00
vertoe
e6c36ddd92 Fix coinbase maturity 2015-02-12 12:01:13 -07:00
vertoe
2f160ef0d2 only include translations >75% 2015-02-12 12:01:13 -07:00
vertoe
34f49aa95f Pull translations from transifex. 2015-02-12 12:01:13 -07:00
UdjinM6
cc9eef01a2 fix time to switch "out of sync" message on/of to make UI more consistent (as we are 4x times faser than bitcoin) 2015-02-12 17:41:13 +03:00
UdjinM6
68cbba1621 allow getAnonymizedBalance calculation on sync again 2015-02-12 17:41:13 +03:00
UdjinM6
9823b9ebad Solve performance problems by caching and fix probable security issue
- add number of rounds to outputs
- cache rounds calculation results of GetInputDarksendRounds
- select shortest rounds chain instead of the first found
2015-02-12 17:41:02 +03:00
UdjinM6
5011bc2e2a fix twice denominatedBalance calculations 2015-02-12 16:54:24 +03:00
UdjinM6
843dc81178 add "out of sync" message to DS section too 2015-02-12 16:32:34 +03:00
UdjinM6
90b2a44045 wallet - fix locks / cleanup a bit 2015-02-12 16:26:32 +03:00
vertoe
e683afcb4b Pull translations from transifex. 2015-02-12 13:29:04 +01:00
vertoe
d3d440780f Add bulgarian and norwegian translations. 2015-02-12 11:16:00 +01:00
vertoe
f3ff766da4 Update transifex source file. 2015-02-12 11:07:52 +01:00
vertoe
6fe1b77b76 Fix some strings in the UI. 2015-02-12 11:07:02 +01:00
evan82
d1d31ad4c3 Merge pull request #175 from vertoe/devel-0.9
Translations cleanup.
2015-02-11 22:14:42 -07:00
evan82
0724070661 Merge pull request #172 from crowning-/patch-3
Minor UI changes for Overview Page
2015-02-11 22:13:52 -07:00
evan82
1165740d5e Merge pull request #171 from crowning-/patch-2
Added link to Transifex translation site for missing languages
2015-02-11 22:13:39 -07:00
Evan Duffield
662d01733d added spork for resolving forks 2015-02-11 21:21:28 -07:00
Evan Duffield
c8c4cc48f2 fix propagation of spork messages 2015-02-11 13:40:54 -07:00
Evan Duffield
23ea75f737 Add maximum out value for IX via spork 2015-02-11 08:08:55 -07:00
vertoe
15ec4d5cff Pull translations >60% from transifex. 2015-02-11 08:31:03 +01:00
UdjinM6
6dc44bdfa5 IsInitialBlockDownload time range down to 6 hours = ~144 blocks -> 2 x forks detection time (fixing comments there too) 2015-02-11 03:08:28 +03:00
UdjinM6
a948de8009 do not calculate anonymized balance during initial download or while in lite mode 2015-02-11 02:50:35 +03:00
crowning-
b279d638ab Minor UI changes for Overview Page
1: Darksend layout widened by 2 characters (4 digit amounts + 2 digit rounds didn't fit in some languages)
2: "Last Darksend Status" messages use now the increased width from 1:
2015-02-10 22:09:36 +01:00
crowning-
4fb746a003 Update optionsdialog.ui 2015-02-10 21:53:14 +01:00
crowning-
40332c7d40 Added link to Transifex translation site for missing languages 2015-02-10 20:55:26 +01:00
UdjinM6
4e94fe1d52 cherry-pick:
[Qt, OSX] QProgressBar CPU-Issue workaround
6093aa1bb0
0ceab00d16
[Qt, OSX] fix Qt4.8 compatibility with QProgressBar issue
c5a2282855
2015-02-10 16:45:37 +03:00
UdjinM6
f9e80690b9 resolve conflicts / clean yet unused functionality 2015-02-10 16:35:08 +03:00
UdjinM6
24e5470c0d cherry-pick 023e63df78 2015-02-10 16:24:05 +03:00
vertoe
3ad14efefc merge downstream 0.11.1 2015-02-10 13:08:49 +01:00
vertoe
d1630bddd5 Pull translations from transifex. 2015-02-10 13:08:39 +01:00
Evan Duffield
ba12e5905e fixed log message and added checkpoint 2015-02-10 03:45:21 -07:00
vertoe
f73caedab1 only include translations >80% (now really\!) 2015-02-10 10:15:31 +01:00
vertoe
96de137ea0 Pull translations from transifex. 2015-02-10 10:03:41 +01:00
vertoe
0d63fcd541 only include translations >90% 2015-02-10 09:41:06 +01:00
vertoe
4a07c0c994 Revert "Fix coinbase maturity"
This reverts commit eafb791d8c.
2015-02-10 09:33:30 +01:00
vertoe
f45091fc77 Pull translations from transifex. 2015-02-10 09:07:45 +01:00
vertoe
eafb791d8c Fix coinbase maturity 2015-02-10 08:57:27 +01:00
vertoe
5b13738c31 only include translations >75% 2015-02-10 08:53:57 +01:00
vertoe
fc059983e2 merge downstream 0.11.1 2015-02-10 08:42:06 +01:00
Evan Duffield
e6ec9665d5 min proto / version 2015-02-09 19:43:39 -07:00
Evan Duffield
0148b8b939 added unknown inv messages 2015-02-09 15:39:50 -07:00
Evan Duffield
db4d5443ac remove debug message 2015-02-09 15:38:16 -07:00
Evan Duffield
c7206802e4 fixed attribution 2015-02-09 14:06:11 -07:00
Evan Duffield
6ab868a3e7 added spork files 2015-02-09 13:54:51 -07:00
Evan Duffield
38df2bf093 version bump/ proto bump 2015-02-09 13:43:10 -07:00
Evan Duffield
886f45379a fixed caching 2015-02-09 13:36:45 -07:00
Evan Duffield
a119b3008c use inventory system for masternode winners 2015-02-09 13:23:42 -07:00
Evan Duffield
f510cc309b use block hash caching 2015-02-09 13:21:12 -07:00
Evan Duffield
257078d2a4 Full Spork Implementation
Many sporks are supported at once, with efficient broadcasting
via inventory messages.
2015-02-09 12:49:00 -07:00
Evan Duffield
5dc643f9b0 Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x 2015-02-09 08:04:02 -07:00
Evan Duffield
f8f1435147 Fixed UI refreshed issues 2015-02-09 08:03:37 -07:00
vertoe
e4a2eb5842 Pull translations from transifex. 2015-02-09 12:05:14 +01:00
evan82
562a126d99 Merge pull request #169 from vertoe/devel-0.9
Weekly translations update
2015-02-08 22:40:12 -07:00
Evan Duffield
9f91d3cd9e fixed possibility of IX getting a lack of fees 2015-02-08 22:38:22 -07:00
Evan Duffield
a4c8341b98 revert changes to calcScore 2015-02-08 21:57:50 -07:00
Evan Duffield
8d913937f4 change rules for dealing with forks 2015-02-08 17:39:18 -07:00
Evan Duffield
c7a3729637 make calcScore return the same results on all platforms 2015-02-08 17:16:38 -07:00
vertoe
7161aa9baa Add languages. 2015-02-08 23:19:17 +01:00
vertoe
cbca74812e Pull translations from transifex. 2015-02-08 23:17:13 +01:00
vertoe
3cdb0d474a Update translation source. 2015-02-08 22:37:44 +01:00
vertoe
a121f12612 Fix typo in instantx string. 2015-02-08 22:36:08 +01:00
vertoe
825a430c7a merge downstream 0.11.1 2015-02-08 22:26:11 +01:00
Evan Duffield
dd48c4a352 enable IX when fork detected 2015-02-08 11:59:09 -07:00
Evan Duffield
5e34edef4c set checkpoint 2015-02-08 09:22:12 -07:00
Evan Duffield
f9d6ba25fa Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x 2015-02-08 08:46:48 -07:00
Evan Duffield
1b6be50f5d restarting testnet 2015-02-08 08:46:30 -07:00
evan82
a7d5594d8c Merge pull request #168 from UdjinM6/v0.11.1.x_tx_types_cleanup
V0.11.1.x tx types cleanup
2015-02-08 08:38:51 -07:00
Evan Duffield
86dd29058f disable rejecting blocks / version bump 2015-02-08 08:05:53 -07:00
UdjinM6
c1d946bc0a use wallet db ds flag in rpc 2015-02-08 17:10:44 +03:00
UdjinM6
3a64318bd2 update tx types in UI / fix tx decomposition / use wallet db ds flag in UI 2015-02-08 17:10:01 +03:00
UdjinM6
c8c14effff use wallet db to save ds flag / debug 2015-02-08 17:03:39 +03:00
UdjinM6
562b844819 use AvailableCoinsType instead of string in walletmodel 2015-02-08 17:00:23 +03:00
Evan Duffield
ddc31b0ff7 fixed issues with ix signature propagation 2015-02-07 20:54:36 -07:00
Evan Duffield
0d8ae6fc16 version/proto/min version bump 2015-02-07 20:23:43 -07:00
Evan Duffield
e4b5b6c5f6 Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x 2015-02-07 20:04:43 -07:00
Evan Duffield
2f56ecb10a protocol version 2015-02-07 20:04:08 -07:00
evan82
01356fca76 Merge pull request #167 from UdjinM6/v0.11.1.x_fix_SelectCoins_best_sub_loops
optimize SelectCoinsMinConf best subset loops
2015-02-07 13:12:30 -07:00
Evan Duffield
e3dcc84415 added debuging for fork detection 2015-02-07 13:05:10 -07:00
evan82
77452b6b86 Merge pull request #166 from UdjinM6/v0.11.1.x_fix_MakeCollateralAmounts
fix: MakeCollateralAmounts stuck sometimes
2015-02-07 13:02:43 -07:00
evan82
c187e8288c Merge pull request #164 from UdjinM6/v0.11.1.x_optimize_notifytxchanges_call
call NotifyTransactionChanged for the same prevout tx hash only once per tx commit
2015-02-07 13:01:34 -07:00
evan82
37680d0fe1 Merge pull request #163 from UdjinM6/v0.11.1.x_fix_sendcoinsdialog_mess_on_mac
fix checkbox mess on mac / get rid of line in sendcoinsdialog
2015-02-07 13:00:06 -07:00
evan82
78c0258306 Merge pull request #162 from UdjinM6/v0.11.1.x_fix_balances
v0.11.1.x fix balances calculations when there are conflicted coins / slight optimizations
2015-02-07 12:59:45 -07:00
Evan Duffield
0a077975c7 fixed calcscore 2015-02-07 12:58:43 -07:00
Evan Duffield
a49cc8f5d5 debug 2015-02-07 12:35:33 -07:00
Evan Duffield
4ec5370317 added aux2 data for calcscore 2015-02-07 12:07:08 -07:00
Evan Duffield
ef2b9ef223 debugging 2015-02-07 11:31:15 -07:00
Evan Duffield
ee37d4622e proto bump 2015-02-07 10:47:44 -07:00
Evan Duffield
3a263ed1bf fixed platform issues with calcscore / better re-converge after fork 2015-02-07 10:30:16 -07:00
vertoe
a2ae4c900e merge downstream 0.11.1 2015-02-07 16:22:17 +01:00
UdjinM6
ab28751bbe fix 2015-02-07 08:19:02 +03:00
UdjinM6
a30b439259 optimize SelectCoins best subset debug output 2015-02-07 07:39:25 +03:00
UdjinM6
fdbeedfa96 fix MakeCollateralAmounts - cleaned more unneeded calculations 2015-02-07 05:26:59 +03:00
UdjinM6
fd7992dc61 fix MakeCollateralAmounts stuck sometimes and wouldn't let denominating further 2015-02-07 05:18:37 +03:00
Evan Duffield
3a72da77ac clean up tx lock votes on expiration 2015-02-06 13:19:22 -07:00
Evan Duffield
3b35672bb8 version/proto bump 2015-02-06 12:53:31 -07:00
Evan Duffield
c56a54d211 enforce mn port on mainnet only 2015-02-06 12:41:39 -07:00
Evan Duffield
012f0e5660 Implemented inventory system for IX messages 2015-02-06 12:07:22 -07:00
Pieter Wuille
3230b329ea Raise version of created blocks, and enforce DERSIG in mempool 2015-02-06 10:42:01 -08:00
Evan Duffield
dfb3da5ec3 version/protocol bump/min protocol 2015-02-06 09:03:50 -07:00
Evan Duffield
b65d718cf5 debugging 2015-02-06 08:54:39 -07:00
vertoe
165dbbba6d Add icelandic. 2015-02-06 15:07:50 +01:00
vertoe
e9296dcf0b Pull translations from transifex. 2015-02-06 15:04:57 +01:00
vertoe
0f177393b8 Update locale strings. 2015-02-06 15:03:29 +01:00
vertoe
06c7aa1e6e merge downstream 0.11.1 2015-02-06 15:00:12 +01:00
Pieter Wuille
989d49921b Backport of some of BIP66's tests 2015-02-05 21:26:15 -08:00
Pieter Wuille
ab03660824 Implement BIP 66 validation rules and switchover logic 2015-02-05 20:56:10 -08:00
Evan Duffield
76e36bfbea only vote when in the top X nodes 2015-02-05 21:41:17 -07:00
UdjinM6
dc19605ec7 call NotifyTransactionChanged for the same prevout tx hash only once per tx commit 2015-02-06 07:25:46 +03:00
UdjinM6
7a43249d56 fix checkbox mess on mac / get rid of line in sendcoinsdialog 2015-02-06 07:09:40 +03:00
UdjinM6
16f725961a - use only trusted coins to calculate anon balance/avg rounds
- use only non-conflicted coins to calculate denom balance
- move GetDepthInMainChain and some conditions out of loops
2015-02-06 04:53:28 +03:00
Evan Duffield
6149e55710 extend txlock expiration 2015-02-05 17:49:55 -07:00
Evan Duffield
22e1e1c1c8 Merge branch 'v0.11.1.x' of https://github.com/darkcoinproject/darkcoin into v0.11.1.x 2015-02-05 17:33:08 -07:00
Evan Duffield
b27a6a3cac fixed score calculation 2015-02-05 17:32:03 -07:00
Evan Duffield
64e8cbc661 version/protocol bump 2015-02-05 17:16:43 -07:00
vertoe
f21f255252 Pull translations from transifex. 2015-02-06 00:57:29 +01:00
vertoe
8fc3f84ad8 merge downstream 0.11.1 2015-02-06 00:39:58 +01:00
Evan Duffield
a950049541 New improved masternode calculation 2015-02-05 16:26:32 -07:00
Evan Duffield
412f54fe8a added improvements to hashing algorithm / block hash caching 2015-02-05 15:56:59 -07:00
Evan Duffield
f51ee91a2c track requests per IX 2015-02-05 11:29:13 -07:00
Evan Duffield
ae0b956d82 protocol bump 2015-02-05 11:11:50 -07:00
Evan Duffield
598a9586b5 version bump 2015-02-05 10:57:25 -07:00
Evan Duffield
d5376687d4 improvements for resolving forks 2015-02-05 10:56:11 -07:00
Evan Duffield
97d73a72b5 cancel out conflicting locks 2015-02-05 09:48:57 -07:00
Evan Duffield
c3b92a7103 Merge branch 'v0.11.1.x' of https://github.com/darkcoin/darkcoin into v0.11.1.x 2015-02-05 09:01:47 -07:00
Evan Duffield
1e8b4cdbf0 check for null reference 2015-02-05 09:01:14 -07:00
evan82
4f267d5a8d Merge pull request #161 from UdjinM6/v0.11.1.x_fix_overviewpage
V0.11.1.x fix overviewpage
2015-02-05 08:53:14 -07:00
Evan Duffield
c8fc2633ee Various IX improvements
- Fixed a segfault with listtransactions and IX
- Improved the feed back of IX while processing
2015-02-05 08:52:02 -07:00
vertoe
fd2fd3afb1 Pull translations from transifex. 2015-02-05 16:26:02 +01:00
vertoe
78d47c04fe merge downstream 0.11.1 2015-02-05 16:13:05 +01:00
vertoe
7f86afa777 Add serbian (latin) language. 2015-02-05 15:29:51 +01:00
vertoe
76b6a321ce Push transifex source typo. 2015-02-05 15:26:41 +01:00
UdjinM6
7d6e46693c ds progress bar set to 0 at start 2015-02-05 17:26:36 +03:00
UdjinM6
aec4020af0 fix division by 0 in ds progress calculation 2015-02-05 17:20:19 +03:00
Evan Duffield
77bade91be version bump 2015-02-04 21:05:36 -07:00
Evan Duffield
4064c2f5ef Improved IX security / quicker tx scanning 2015-02-04 14:59:19 -07:00
Evan Duffield
ea06ed5bae fix segfault with disablewallet 2015-02-04 14:19:18 -07:00
evan82
157800109c Merge pull request #160 from UdjinM6/v0.11.1.x_fix
fix log message
2015-02-04 14:18:59 -07:00
evan82
0fe4d6a17c Merge pull request #159 from UdjinM6/v0.11.1.x_fix_ds_anon
use only completely anonymized denoms when sending ds tx
2015-02-04 14:18:28 -07:00
Evan Duffield
6ae98a8790 use authoritive block height for IX 2015-02-04 14:09:50 -07:00
Evan Duffield
2a0d3dfb9d Use hash after transaction was mined
- Prevents an attacker from gaming which masternodes they'll use
2015-02-04 13:25:12 -07:00
Evan Duffield
712eb7e9d9 improved conflict resolution 2015-02-04 13:20:13 -07:00
vertoe
7e8d8c9681 Fix typo in darksend. 2015-02-04 20:55:14 +01:00
UdjinM6
5e73fdb9b1 fix log message 2015-02-04 21:38:40 +03:00