diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 00:02:19 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-09-11 00:02:19 +0000 |
| commit | 6d7b6681b6cf5d63a8686c99a431ec401c14379f (patch) | |
| tree | 987bd5c41fa9d127f9f563f9843dd9e466f2b0ea /contrib/debian/control | |
| parent | 2ff8456c11f389f5e7ce29ee0ba3183a6576a167 (diff) | |
| parent | cae8742130b31fc1b23b2108a90db28254807e85 (diff) | |
| download | bitcoin-6d7b6681b6cf5d63a8686c99a431ec401c14379f.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/qt/locale/bitcoin_pt_BR.ts
Diffstat (limited to 'contrib/debian/control')
| -rw-r--r-- | contrib/debian/control | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/debian/control b/contrib/debian/control index b81c02ec1a..d0a2d57c9e 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -43,7 +43,7 @@ Description: peer-to-peer network based digital currency - daemon Package: bitcoin-qt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: peer-to-peer network based digital currency - QT GUI +Description: peer-to-peer network based digital currency - Qt GUI Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and @@ -55,4 +55,4 @@ Description: peer-to-peer network based digital currency - QT GUI Full transaction history is stored locally at each client. This requires 2+ GB of space, slowly growing. . - This package provides bitcoin-qt, a GUI for Bitcoin based on QT. + This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt. |