cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-17 10:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,725 Commits 8 Branches 349 Tags
Commit Graph

140 Commits

Author SHA1 Message Date
Luke Dashjr
3dbe71bd35 Revert "Revert "Update gitian descriptors to point at stable git repo"" 
This reverts commit 6e0c5e3778b83f128f6f14c311d5728392053581.
 2012-08-27 19:22:29 +00:00
Luke Dashjr
e65f25d54e Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	contrib/debian/patches/1001_use_system_json-spirit.patch
	src/key.h
	src/main.cpp
	src/main.h
	src/net.cpp
 2012-07-06 00:54:24 +00:00
Luke Dashjr
59d0486f2f Update Debian "Use system json-spirit" patch to apply 
("Fixed" upstream in 3563824c602cb2b42cc21970935f45ce646c3964)
 2012-07-06 00:43:51 +00:00
Luke Dashjr
7083cc3083 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	contrib/debian/patches/1001_use_system_json-spirit.patch
	src/net.cpp
 2012-07-06 00:42:53 +00:00
Luke Dashjr
f1830a9a22 Merge branch '0.4.x' into 0.5.x 2012-07-06 00:41:57 +00:00
Luke Dashjr
a0cbcfd6ed Update Debian "Use system json-spirit" patch to apply 
("Fixed" upstream in 3563824c602cb2b42cc21970935f45ce646c3964)
 2012-07-05 23:14:20 +00:00
Luke Dashjr
ccf2e853a1 Update Debian "Use system json-spirit" patch to apply 
("Fixed" upstream in 3563824c602cb2b42cc21970935f45ce646c3964)
 2012-07-05 23:13:43 +00:00
Luke Dashjr
3edb53eeed gitian-downloader: Update luke-jr's key 2012-07-05 22:50:53 +00:00
Pieter Wuille
6d6995bc83 Update my GPG key 2012-07-05 22:50:06 +00:00
Gavin Andresen
6e0c5e3778 Revert "Update gitian descriptors to point at stable git repo" 
This reverts commit 1179f6373dfffdcb091576215cabe73c932df925.
 2012-06-19 16:44:55 -04:00
Luke Dashjr
5e322a72f9 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	.gitignore
	src/bitcoinrpc.cpp
	src/main.cpp
	src/qt/bitcoingui.cpp
	src/ui_interface.h
	src/util.cpp
 2012-06-14 18:21:07 +00:00
Luke Dashjr
6ec9d30905 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/main.h
	src/net.cpp
	src/serialize.h
 2012-06-14 18:13:46 +00:00
Matt Corallo
1903033bad Fix broken config files 2012-06-14 17:13:29 +00:00
Matt Corallo
fdd907c9f1 Correct blockchain size in contrib/debian. 
* Updates package description to note that blockchain now takes
  2+ GB instead of 150+ MB.

(PARTIAL of 8f6111bb9cd598954e9634d9fe4500fcf5ae83de)
 2012-06-06 19:24:31 +00:00
Luke Dashjr
18b4eccddb Bump version to 0.4.7 2012-05-08 19:53:29 +00:00
Luke Dashjr
65077e1177 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	bitcoin-qt.pro
	contrib/gitian-descriptors/gitian-win32.yml
	doc/README
	doc/README_windows.txt
	share/qt/make_windows_icon.sh
	share/setup.nsi
	src/bitcoinrpc.cpp
	src/main.cpp
	src/main.h
	src/makefile.linux-mingw
	src/net.cpp
	src/net.h
	src/netbase.h
	src/noui.h
	src/qt/addressbookpage.cpp
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoingui.h
	src/qt/bitcoinstrings.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/optionsmodel.cpp
	src/qt/qrcodedialog.cpp
	src/qt/qtipcserver.cpp
	src/script.cpp
	src/serialize.h
	src/ui_interface.h
	src/uint256.h
 2012-05-05 16:13:56 +00:00
Gavin Andresen
3a70f3a4ec Bump win32.deps version number for new openssl 2012-04-27 14:01:49 -04:00
Gavin Andresen
dd02f3ca6e Windows build: compile against openssl 1.0.1b 2012-04-27 13:57:17 -04:00
Gavin Andresen
b7a2b6e1aa Windows build: compile against openssl 1.0.1b 2012-04-27 13:51:12 -04:00
Gavin Andresen
cedcec2dec Bump win32.deps version number for new openssl 2012-04-27 11:53:11 -04:00
Gavin Andresen
5ad4028050 Windows build: compile against openssl 1.0.1b 2012-04-27 11:19:20 -04:00
Gavin Andresen
2b4d7735b6 Windows build: compile against openssl 1.0.1b 2012-04-27 10:52:14 -04:00
Luke Dashjr
c18b82d5db Bump version to 0.4.6 2012-04-27 10:50:24 -04:00
cardpuncher
06de079091 Added comment lines in French & Turkish which basically mean "Bitcoin, virtual P2P cryptocurrency". 2012-04-11 15:20:59 -04:00
Pieter Wuille
702764f53b Merge pull request #1054 from sipa/buildinfo 
Build identification strings
 2012-04-10 13:31:12 -07:00
Pieter Wuille
a20c0d0f67 Build identification strings 
All client version information is moved to version.cpp, which optionally
(-DHAVE_BUILD_INFO) includes build.h. build.h is automatically generated
on supporting platforms via contrib/genbuild.sh, using git describe.

The git export-subst attribute is used to put the commit id statically
in version.cpp inside generated archives, and this value is used if no
build.h is present.

The gitian descriptors are modified to use git archive instead of a
copy, to create the src/ directory in the output. This way,
src/src/version.cpp will contain the static commit id. To prevent
gitian builds from getting the "-dirty" marker in their git-describe
generated identifiers, no touching of files or running sed on the
makefile is performed anymore. This does not seem to influence
determinism.
 2012-04-10 18:16:53 +02:00
cardpuncher
9c2c932f8c Added comment lines in French & Turkish which basically mean "Bitcoin, virtual P2P cryptocurrency". 2012-04-09 22:22:38 +03:00
Luke Dashjr
0d10cb7a1f Merge branch '0.5.0.x' into 0.5.x 2012-04-05 18:21:01 -04:00
Gavin Andresen
5ce4c2a23a Remove USE_SSL #define 2012-04-04 21:19:27 -04:00
Matt Corallo
d02833c76a Add laanwj to gitian download scripts. 2012-04-04 15:58:15 -04:00
Matt Corallo
bf754cfd01 Add laanwj to gitian download scripts. 2012-04-04 15:58:02 -04:00
Luke Dashjr
fe1725a141 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-04-04 15:43:29 -04:00
Luke Dashjr
658cf0b1be Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	src/qt/bitcoingui.h
 2012-04-04 15:41:07 -04:00
Luke Dashjr
1376cd9d7f Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	bitcoin-qt.pro
	contrib/debian/changelog
	doc/README
	doc/README_windows.txt
	doc/translation_process.md
	share/setup.nsi
	src/bitcoinrpc.cpp
	src/db.cpp
	src/init.cpp
	src/irc.cpp
	src/main.cpp
	src/main.h
	src/makefile.osx
	src/makefile.unix
	src/net.cpp
	src/net.h
	src/qt/bitcoin.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/guiutil.cpp
	src/qt/guiutil.h
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
	src/qt/sendcoinsdialog.h
	src/qt/transactionrecord.cpp
	src/script.cpp
	src/script.h
	src/serialize.h
	src/util.cpp
	src/util.h
 2012-04-04 10:32:09 -04:00
Luke Dashjr
724c65c1f8 Add Luke-Jr's PGP key to gitian-downloader 2012-04-04 10:23:08 -04:00
Luke Dashjr
8fae3dae11 Add Luke-Jr's PGP key to gitian-downloader 2012-04-04 10:23:02 -04:00
Pieter Wuille
3f47eb4a9a Updated my GPG key 2012-04-04 10:17:26 -04:00
Pieter Wuille
2f98e8c1a4 Updated my GPG key 2012-04-04 10:17:18 -04:00
Gregory Maxwell
703d64469e Merge pull request #934 from luke-jr/gitian_luke 
Add Luke-Jr's PGP key to gitian-downloader
 2012-04-03 08:09:13 -07:00
Pieter Wuille
94e6967e98 Updated my GPG key 2012-03-31 15:39:14 +02:00
Luke Dashjr
a41957b873 Add Luke-Jr's PGP key to gitian-downloader 2012-03-22 20:32:41 -04:00
Luke Dashjr
49e1501b5d Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build 
It could just as well be on either part of the gitian build, but to safely put it on the Qt side would require bumping the filename, and every gitian user rebuilding it.
v0.5.3.1 put it on the Bitcoin side, and this is easier to work with and keep safe, so I'm moving it.

Use `qmake MINGW_THREAD_BUGFIX=0` to disable
 2012-03-22 12:46:47 -04:00
Luke Dashjr
815a3605c1 Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
 2012-03-21 13:22:24 -04:00
Luke Dashjr
b3ba40c6bf Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build 
It could just as well be on either part of the gitian build, but to safely put it on the Qt side would require bumping the filename, and every gitian user rebuilding it.
v0.5.3.1 put it on the Bitcoin side, and this is easier to work with and keep safe, so I'm moving it.
 2012-03-19 12:11:49 -04:00
Luke Dashjr
eca170286e Merge branch '0.5.0.x' into 0.5.x 
Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
 2012-03-16 16:45:32 -04:00
Luke Dashjr
ffef16404d Bump version to 0.4.5 2012-03-16 16:04:26 -04:00
Matt Corallo
76a3bfa17c Fix Win32 RPC Crashes. 2012-03-16 15:49:30 -04:00
Matt Corallo
8864019f6d Fix Win32 RPC Crashes. 2012-03-16 14:28:54 -04:00
Matt Corallo
3d0a0a9b9e Make deps build deterministic and upgrade to libpng 1.5.9. 2012-02-22 22:09:06 -05:00
Wladimir J. van der Laan
ec2ed58232 Merge pull request #834 from sje397/BackupWallet 
Added 'Backup Wallet' menu option to GUI
 2012-02-17 10:30:15 -08:00