Gavin Andresen
23e7583a8c
Merge branch '0.6.x' of git://gitorious.org/+bitcoin-stable-developers/bitcoin/bitcoind-stable into 0.6.3
2012-06-19 16:34:10 -04:00
Gavin Andresen
db4036a829
Bump version numbers to 0.6.3
2012-06-19 14:44:38 -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
Luke Dashjr
3703150d56
Merge branch '0.4.x' into 0.5.x
...
Conflicts:
doc/release-process.txt
src/serialize.h
2012-06-14 18:07:11 +00:00
Matt Corallo and Luke Dashjr
ca39829ecb
Update wiki changelog at doc/release-process.txt
2012-06-14 17:21:05 +00:00
Chris Moore and Luke Dashjr
7c4de78a5c
"USE_UPNP=-" is needed to remove UPnP support.
2012-06-06 19:21:15 +00:00
Luke Dashjr
a49927a46d
Merge branch '0.6.0.x' into 0.6.x
...
Conflicts:
bitcoin-qt.pro
doc/README
doc/README_windows.txt
share/setup.nsi
src/bitcoinrpc.h
src/db.h
src/headers.h
src/init.cpp
src/main.cpp
src/main.h
src/noui.h
src/qt/bitcoin.cpp
src/qt/locale/bitcoin_en.ts
src/qt/walletmodel.cpp
src/script.cpp
src/ui_interface.h
src/util.cpp
2012-05-22 23:07:46 +00:00
Christian von Roques and Luke Dashjr
fba681519a
Fix typo. libarcode => libqrcode
2012-05-18 00:04:59 +00:00
Luke Dashjr
8fa3259664
Bump version to 0.6.0.8
2012-05-08 20:11:44 +00:00
Luke Dashjr
35a07f8ec4
Bump version to 0.5.6
2012-05-08 20:09:43 +00:00
Luke Dashjr
18b4eccddb
Bump version to 0.4.7
2012-05-08 19:53:29 +00:00
Gavin Andresen
8ff1873096
Bump versions for 0.6.2
2012-05-08 12:58:39 -04:00
Gavin Andresen
397737b913
Bump version numbers for 0.6.1rc2
2012-05-04 10:22:26 -04:00
Gavin Andresen and Luke Dashjr
dd02f3ca6e
Windows build: compile against openssl 1.0.1b
2012-04-27 13:57:17 -04:00
Gavin Andresen and Luke Dashjr
b7a2b6e1aa
Windows build: compile against openssl 1.0.1b
2012-04-27 13:51:12 -04:00
Gavin Andresen and Luke Dashjr
5ad4028050
Windows build: compile against openssl 1.0.1b
2012-04-27 11:19:20 -04:00
Luke Dashjr
e5f43fe309
Bump version to 0.5.5
2012-04-27 10:55:06 -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
Gavin Andresen
2c31cfc271
Bump version numbers for 0.6.1rc1
2012-04-27 10:14:33 -04:00
Luke Dashjr
3374c3ef09
Merge branch '0.5.x' into 0.6.0.x
...
Conflicts:
src/qt/bitcoin.cpp
src/qt/bitcoingui.cpp
src/qt/guiutil.cpp
src/qt/guiutil.h
src/qt/sendcoinsdialog.cpp
src/qt/sendcoinsdialog.h
src/util.cpp
2012-04-15 21:15:48 -04:00
Luke Dashjr
b7566fe29c
Bump version to 0.6.0.7
...
Skipping 0.6.0.1 through 0.6.0.6 since the internal version for 0.6.0[.0] was in fact 0.6.0.6
2012-04-15 13:08:21 -04: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
Luke Dashjr
892fcaf291
Merge branch '0.5.0.x' into 0.5.x
...
Conflicts:
src/qt/notificator.h
2012-04-06 16:34:34 -04:00
Luke Dashjr
a93bb51604
Merge branch 'strlcpy_attribute' into 0.5.0.x
2012-04-05 19:43:06 -04:00
Gavin Andresen
3acee27b14
Merge pull request #1047 from luke-jr/strlcpy_attribute
...
Document strlcpy.h in assets-attribution.txt since it isn't MIT-licensed
2012-04-05 16:41:20 -07:00
Luke Dashjr
7993454a92
Document strlcpy.h in assets-attribution.txt since it isn't MIT-licensed
2012-04-05 18:58:20 -04:00
Gavin Andresen
5ce4c2a23a
Remove USE_SSL #define
2012-04-04 21:19:27 -04:00
Luke Dashjr
9a133240d3
Merge branch '0.5.0.x' into 0.5.x
2012-03-26 20:07:28 -04:00
Luke Dashjr
68d889db34
Fix grammatical errors in translation process documentation (partial of 2fac102)
2012-03-22 16:15:30 -04:00
Philip Kaufmann
2fac1028a8
updated translation process documentation
2012-03-21 18:41:11 +01:00
Luke Dashjr
0a1c5c9b10
Bump version to 0.5.0.6
2012-03-19 12:15:03 -04:00
Luke Dashjr
7f23df06d7
Bump version to 0.5.4
2012-03-16 16:12:16 -04:00
Luke Dashjr
f322aa4d60
Bump version to 0.5.0.5
2012-03-16 16:11:11 -04:00
Luke Dashjr
ffef16404d
Bump version to 0.4.5
2012-03-16 16:04:26 -04:00
Nils Schneider
6c757e99f3
add shell one-liner for updating translations in bitcoin.qrc
2012-03-16 19:03:43 +01:00
Gavin Andresen
50abb5516d
Updated Mac build process
2012-02-29 21:04:56 -05:00
Matt Corallo
95486d5c48
Fix release-process.txt for new deps zip.
2012-02-29 16:12:36 -05:00
Matt Corallo
3d0a0a9b9e
Make deps build deterministic and upgrade to libpng 1.5.9.
2012-02-22 22:09:06 -05:00
sje397
4efbda3f25
Added 'Backup Wallet' menu option
...
- icon from the LGPL Nuvola set (like the tick) - http://www.icon-king.com/projects/nuvola/
- include 'boost/version.hpp' in db.cpp so that the overwrite version of copy can be used
- catch exceptions in BackupWallet (e.g. filesystem_error thrown when trying to overwrite without the overwrite flag set)
- include db.h in walletmodel.cpp for BackupWallet function
- updated doc/assets-attribution.txt and contrib/debian/copyright with copyright info for new icon
2012-02-15 23:29:59 +11:00
Luke Dashjr
a21e4da901
Merge branch '0.5.0.x' into 0.5.x
...
Conflicts:
src/qt/locale/bitcoin_ru.ts
src/qt/locale/bitcoin_zh_TW.ts
2012-02-07 22:49:03 -05:00
Luke Dashjr
b5d9c7d9fb
Merge branch '0.4.x' into 0.5.0.x
...
Conflicts:
src/bitcoinrpc.cpp
2012-02-07 22:46:07 -05:00
Luke Dashjr
4664aae3fe
Update copyrights to 2012 for files modified this year
2012-02-07 22:30:50 -05:00
Wladimir J. van der Laan
328b26d40b
Update readme-qt.rst for 0.6.0
...
- Remove features list (no longer makes sense)
- Document USE_QRCODE
2012-02-07 21:16:28 +01:00
Gavin Andresen
a15bc17632
Merge pull request #805 from luke-jr/gitian_deps
...
Split dependencies into deps-gitian.yml
2012-02-07 09:23:34 -08:00
Luke Dashjr
f1142dcc5b
Update doc/release-process.txt
2012-02-07 12:12:10 -05:00
Gavin Andresen
882164196e
Update all copyrights to 2012
2012-02-07 11:28:30 -05:00
Gavin Andresen
6bf4253a68
Increase client version to 0.6
2012-02-07 11:22:09 -05:00
p2k and Gavin Andresen
f118b5fc5d
miniupnpc Porfile removed; new and improved macdeployqtplus
...
* My patch for miniupnpc has made it into the latest MacPorts release: https://trac.macports.org/ticket/31354
* Documentation has been changed appropriately
* New pure-Python macdeployqt; leverages all problems with the stock macdeployqt
2012-02-06 09:33:12 -05:00
Gavin Andresen