highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-01 00:34:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename Core to Classic

Browse Source 
Squased commits from rustyloy and others and fixed merge
conflicts.
This commit is contained in:
rustyloy
2016-01-24 08:41:54 -05:00
committed by Tom Zander
parent 7488c45bc1
commit f2d9c84a2e
50 changed files with 121 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
README.md
View File

@@ -1,9 +1,9 @@
Bitcoin Core integration/staging tree
Bitcoin Classic integration/staging tree
=====================================
[![Build Status](https://travis-ci.org/bitcoin/bitcoin.svg?branch=master)](https://travis-ci.org/bitcoin/bitcoin)
[![Build Status](https://travis-ci.org/bitcoinclassic/bitcoinclassic.svg?branch=master)](https://travis-ci.org/bitcoinclassic/bitcoinclassic)
https://bitcoincore.org
https://bitcoinclassic.com
What is Bitcoin?
----------------
@@ -11,32 +11,45 @@ What is Bitcoin?
Bitcoin is an experimental new digital currency that enables instant payments to
anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
with no central authority: managing transactions and issuing money are carried
out collectively by the network. Bitcoin Core is the name of open source
software which enables the use of this currency.
out collectively by the network.
For more information, as well as an immediately useable, binary version of
the Bitcoin Core software, see https://www.bitcoin.org/en/download.
the Bitcoin Classic software, see https://bitcoinclassic.com.
What is Bitcoin Classic?
------------------------
Bitcoin Classic is currently a one-time increase in total amount of transaction data permitted in a block from 1MB to 2MB, with limits on signature operations and hashing. We will have ports for master and 0.11.2, so that miners and businesses can upgrade to 2 MB blocks from any recent bitcoin software version they run.
Read the [block size increase BIP](https://github.com/gavinandresen/bips/blob/92e1efd0493c1cbde47304c9711f13f413cc9099/bip-bump2mb.mediawiki) for more information.
In the future Bitcoin Classic will continue to release updates that are in line with Satoshi’s whitepaper & vision, and are agreed upon by the community.
License
-------
Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
Bitcoin Classic is released under the terms of the MIT license. See [COPYING](COPYING) for more
information or see https://opensource.org/licenses/MIT.
Development Process
-------------------
The `master` branch is regularly built and tested, but is not guaranteed to be
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
regularly to indicate new official, stable release versions of Bitcoin Core.
completely stable. [Tags](https://github.com/bitcoinclassic/bitcoinclassic/tags) are created
regularly to indicate new official, stable release versions of Bitcoin Classic.
The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).
The developer [mailing list](https://lists.linuxfoundation.org/mailman/listinfo/bitcoin-dev)
should be used to discuss complicated or controversial changes before working
on a patch set.
Complicated or controversial changes should be discussed within the communtiy before working on a patch set.
Developer IRC can be found on Freenode at #bitcoin-core-dev.
Community
---------
- Primary Website: https://bitcoinclassic.com/
- Slack: http://invite.bitcoinclassic.com/
- Reddit: https://www.reddit.com/r/Bitcoin_Classic/
- GitHub: https://github.com/bitcoinclassic
- ConsiderIt (issue voting): https://bitcoinclassic.consider.it/
Testing
-------
@@ -70,12 +83,10 @@ Translations
------------
Changes to translations as well as new translations can be submitted to
[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/).
[Bitcoin Classic's Transifex page](https://www.transifex.com/bitcoinclassic/bitcoinclassic/).
Translations are periodically pulled from Transifex and merged into the git repository. See the
[translation process](doc/translation_process.md) for details on how this works.
**Important**: We do not accept translation changes as GitHub pull requests because the next
pull from Transifex would automatically overwrite them again.
Translators should also subscribe to the [mailing list](https://groups.google.com/forum/#!forum/bitcoin-translators).