Wladimir J. van der Laan
5dd7318db7
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2011-09-16 06:55:47 +02:00
Gavin Andresen
217208a36d
Merge pull request #516 from TheBlueMatt/nsisiconfix
...
Update bitcoin icon to make nsis setup exe deterministic.
2011-09-14 08:03:36 -07:00
Matt Corallo
6083295f46
Update bitcoin icon to make nsis setup exe deterministic.
...
This adds a 32x32 16-bit icon to the bitcoin.ico file.
Though this realistically probably looks worse than the 32-bit
32x32 being displayed on a 16-bit monitor, it makes the nsis
setup exe deterministic in gitian output (go figure) which makes
the slight visual loss for users of very old monitors/computers
worth it.
2011-09-14 10:59:54 -04:00
Jeff Garzik
53c6c12886
Merge pull request #512 from paraipanakos/master
...
Spanish translation update
2011-09-13 13:21:09 -07:00
flower
c1e667222a
make German translation up-to-date
2011-09-13 18:55:50 +02:00
Jeff Garzik
38fd861fff
Merge pull request #511 from mibe/translation-de
...
Updated German translation
2011-09-11 18:45:00 -07:00
Michael Bemmerl
c4149423f9
Updated German translation
2011-09-12 01:16:44 +02:00
Alex B
b4af75c07f
Spanish translation update
2011-09-11 22:08:43 +02:00
Wladimir J. van der Laan
83312d7c6c
remove transparency effect and windows-specific code for now, it's not working as supposed
2011-09-11 21:06:23 +02:00
Wladimir J. van der Laan
1837644c4a
Merge pull request #22 from p2k/master
...
Some improvements for Mac OS X
2011-09-11 08:52:57 -07:00
p2k
2c1fd3c395
Some Mac OS X specific things
...
* Added application icon for Mac OS X * Added instructions for compiling
under Mac OS X * Added Portfile for compiling miniupnpc with MacPorts
2011-09-11 17:42:20 +02:00
Wladimir J. van der Laan
d33cc2b5e3
clarify function signature (GetNumBlocksOfPeers) and use number of 'frozen' blocks as initial value for number of peer blocks
2011-09-11 10:49:30 +02:00
Janne Pulkkinen
78b3bf56f7
The synchronization progress bar now compares the amount of total blocks to amount of blocks downloaded at application start-up. Could be probably implemented better.
2011-09-11 10:29:29 +02:00
Gavin Andresen
95cea79e39
Merge pull request #509 from cjdelisle/walletCrypto-wx-minVersion
...
wxWidgets needs to be at least version 2.9.1 because wallet crypto uses T
2011-09-09 11:46:04 -07:00
Gavin Andresen
b56658bdad
Merge pull request #508 from TheBlueMatt/master
...
Update gitian build descriptors to produce proper builds.
2011-09-09 11:45:46 -07:00
Matt Corallo
0295912479
Update gitian build descriptors to produce proper builds.
...
Thanks to makomk for finding the bugs here and devrandom
for passing them along (see
https://bitcointalk.org/index.php?topic=42198.msg514312#msg514312 )
2011-09-09 12:35:42 -04:00
Gavin Andresen
b7598ceefa
Merge pull request #505 from gavinandresen/unique_coinbase
...
Unique coinbase: Fixes #482
2011-09-09 06:34:37 -07:00
cjdelisle
3448ce56f4
wxWidgets needs to be at least version 2.9.1 because wallet crypto uses ToStdString() which is not in 2.9.0
2011-09-08 20:50:00 -04:00
Wladimir J. van der Laan
9b9e2f1748
http -> https
2011-09-08 18:07:07 +02:00
Wladimir J. van der Laan
a0d2f9a12d
Merge branch 'master' of https://github.com/bitcoin/bitcoin
...
Conflicts:
.gitignore
2011-09-07 18:57:11 +02:00
Wladimir J. van der Laan
f077d1ad62
fix the build (moved code use 'this' instead of 'window')
2011-09-07 18:16:38 +02:00
Janne Pulkkinen
94723e27ad
Pull request #21 : windows fixes/cleanup by Matoking
2011-09-07 17:45:07 +02:00
Gavin Andresen
5a3dea451d
Merge branch 'unique_coinbase' of git://gitorious.org/~Luke-Jr/bitcoin/luke-jr-bitcoin into unique_coinbase
2011-09-07 10:51:57 -04:00
Gavin Andresen
f92f022eda
Merge pull request #500 from gavinandresen/txndeadlock
...
Fix AddAddress cs_mapaddresses/db transaction deadlock
2011-09-07 07:29:44 -07:00
Gavin Andresen
9406696578
Fix AddAddress cs_mapaddresses/db transaction deadlock
2011-09-06 20:28:15 -04:00
Luke Dashjr
83f4cd156e
Bugfix: Use timestamp in coinbase rather than "bits", needed to ensure coinbase txn is unique even if address is the same
2011-09-06 16:43:40 -04:00
Luke Dashjr
49c8e53ee2
Save coinbase, not just extraNonce
2011-09-06 16:43:35 -04:00
Luke Dashjr
b760e25458
Merge branch 'getwork_dedupe' into unique_coinbase
2011-09-06 16:43:32 -04:00
Jeff Garzik
0535644b30
Merge branch 'master' of git://github.com/bitcoin/bitcoin
2011-09-06 16:20:24 -04:00
Jeff Garzik
cbd959c473
Revert "Define MSG_NOSIGNAL to 0 on platforms where it is unavailable."
...
This reverts commit 6a0296791d
2011-09-06 16:19:54 -04:00
Jeff Garzik
ff4bd3977a
Merge pull request #503 from TheBlueMatt/translatefix
...
Add binary mo for new translation.
2011-09-06 12:03:08 -07:00
Matt Corallo
fd5eaf323f
Add binary mo for new translation.
2011-09-06 15:01:58 -04:00
Jeff Garzik
074653973e
Merge pull request #502 from vsrinivas/master
...
Define MSG_NOSIGNAL to 0 when it is not defined. Gets OpenBSD building.
2011-09-06 11:58:42 -07:00
Venkatesh Srinivas
6a0296791d
Define MSG_NOSIGNAL to 0 on platforms where it is unavailable.
...
Enables building bitcoind on OpenBSD.
2011-09-06 14:54:10 -04:00
Jeff Garzik
04f9a37c71
Merge pull request #501 from paraipanakos/master
...
Added Romanian translation
2011-09-06 11:50:56 -07:00
Alex B
905cbf0bf8
Romanian translation added
2011-09-06 20:41:33 +02:00
Luke Dashjr
e39f925655
ignore stuff
2011-09-06 13:53:04 -04:00
Gavin Andresen
e4626e94f4
Merge pull request #491 from gavinandresen/manytxfix
...
Optimize database writes for transactions with lots of TxIns.
2011-09-06 10:47:27 -07:00
Gavin Andresen
dc0c768760
Merge pull request #499 from codler/patch-3
...
Add a note to only include .po file
2011-09-06 10:20:22 -07:00
Han Lin Yap
e03209979b
Add a note to only include .po file
2011-09-06 20:13:43 +03:00
Gavin Andresen
c5eed9a1ae
Merge pull request #490 from TheBlueMatt/master
...
Fix build process to actually work (yet again).
2011-09-06 05:26:23 -07:00
Gavin Andresen
a79401b31d
Merge pull request #496 from alexwaters/boost_fs3
...
Support for boost filesystem version 3
2011-09-06 05:25:29 -07:00
Jeff Garzik
cc558f0603
README.md: word wrap text file
2011-09-05 23:02:35 -04:00
Jeff Garzik
3a7c4d89de
Merge pull request #495 from alexwaters/readme
...
Updated readme file
2011-09-05 20:01:55 -07:00
Alex Waters
adb8a55b46
Updated readme file
2011-09-05 21:16:46 -04:00
Gavin Andresen
e077cce617
Optimize database writes for transactions with lots of TxIns.
...
Patch from ArtForz, who discovered the problem.
2011-09-05 14:33:07 -04:00
Wladimir J. van der Laan
cf9195c808
(k)ubuntu 10.04+ notification support (based on @zwierzak his code)
2011-09-03 21:05:12 +02:00
Wladimir J. van der Laan
69e87633bc
Merge branch 'master' of github.com:laanwj/bitcoin-qt
2011-09-03 20:51:48 +02:00
Matt Corallo
7b7d46be89
Fix build process to actually work.
2011-09-03 12:38:20 -04:00
Luke Dashjr
a687d4f574
Support for boost filesystem version 3
2011-09-03 11:24:45 -04:00
