Skip to content

Commit

Permalink
Rebrand user-visible text and build process "bitcoin" -> "freicoin".
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Friedenbach committed Dec 31, 2013
1 parent d82a66e commit 14ffd72
Show file tree
Hide file tree
Showing 108 changed files with 1,201 additions and 1,245 deletions.
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
src/*.exe
src/bitcoin
src/bitcoind
src/test_bitcoin
src/freicoin
src/freicoind
src/test_freicoin
.*.swp
*.*~*
*.bak
*.rej
*.orig
*.o
*.patch
.bitcoin
.freicoin

# Compilation and Qt preprocessor part
*.qm
Makefile
bitcoin-qt
Bitcoin-Qt.app
freicoin-qt
Freicoin-Qt.app

# Unit-tests
Makefile.test
bitcoin-qt_test
freicoin-qt_test

# Resources cpp
qrc_*.cpp
Expand Down
32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
Bitcoin integration/staging tree
================================
Freicoin integration/staging tree
=================================

http://www.bitcoin.org
http://www.freico.in/

Copyright (c) 2009-2013 Bitcoin Developers

What is Bitcoin?
----------------
What is Freicoin?
-----------------

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
Freicoin is an experimental new digital currency that enables instant payments to
anyone, anywhere in the world. Freicoin uses peer-to-peer technology to operate
with no central authority: managing transactions and issuing money are carried
out collectively by the network. Bitcoin is also the name of the open source
out collectively by the network. Freicoin is also the name of the open source
software which enables the use of this currency.

For more information, as well as an immediately useable, binary version of
the Bitcoin client software, see http://www.bitcoin.org.
the Freicoin client software, see http://www.freico.in.

License
-------

Bitcoin is released under the terms of the MIT license. See `COPYING` for more
Freicoin is released under the terms of the MIT license. See `COPYING` for more
information or see http://opensource.org/licenses/MIT.

Development process
Expand All @@ -29,21 +29,21 @@ Development process
Developers work in their own trees, then submit pull requests when they think
their feature or bug fix is ready.

If it is a simple/trivial/non-controversial change, then one of the Bitcoin
If it is a simple/trivial/non-controversial change, then one of the Freicoin
development team members simply pulls it.

If it is a *more complicated or potentially controversial* change, then the patch
submitter will be asked to start a discussion (if they haven't already) on the
[mailing list](http://sourceforge.net/mailarchive/forum.php?forum_name=bitcoin-development).
[mailing list](https://groups.google.com/forum/#!forum/freicoin).

The patch will be accepted if there is broad consensus that it is a good thing.
Developers should expect to rework and resubmit patches if the code doesn't
match the project's coding conventions (see `doc/coding.md`) or are
controversial.

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.
completely stable. [Tags](https://github.com/freicoin/freicoin/tags) are created
regularly to indicate new official, stable release versions of Freicoin.

Testing
-------
Expand All @@ -64,9 +64,9 @@ Unit tests for the core code are in `src/test/`. To compile and run them:

Unit tests for the GUI code are in `src/qt/test/`. To compile and run them:

qmake BITCOIN_QT_TEST=1 -o Makefile.test bitcoin-qt.pro
qmake FREICOIN_QT_TEST=1 -o Makefile.test freicoin-qt.pro
make -f Makefile.test
./bitcoin-qt_test
./freicoin-qt_test

Every pull request is built for both Windows and Linux on a dedicated server,
and unit and sanity tests are automatically run. The binaries produced may be
Expand Down
4 changes: 2 additions & 2 deletions bitcoin-qt.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = bitcoin-qt
macx:TARGET = "Bitcoin-Qt"
TARGET = freicoin-qt
macx:TARGET = "Freicoin-Qt"
VERSION = 0.8.6
INCLUDEPATH += src src/json src/qt
QT += network
Expand Down
4 changes: 2 additions & 2 deletions contrib/bitrpc/bitrpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

elif cmd == "getaccount":
try:
addr = raw_input("Enter a Bitcoin address: ")
addr = raw_input("Enter a Freicoin address: ")
print access.getaccount(addr)
except:
print "\n---An error occurred---\n"
Expand Down Expand Up @@ -126,7 +126,7 @@

elif cmd == "getreceivedbyaddress":
try:
addr = raw_input("Enter a Bitcoin address (optional): ")
addr = raw_input("Enter a Freicoin address (optional): ")
mc = raw_input("Minimum confirmations (optional): ")
try:
print access.getreceivedbyaddress(addr, mc)
Expand Down
12 changes: 0 additions & 12 deletions contrib/debian/bitcoin-qt.desktop

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/debian/bitcoin-qt.install

This file was deleted.

1 change: 0 additions & 1 deletion contrib/debian/bitcoind.bash-completion

This file was deleted.

1 change: 0 additions & 1 deletion contrib/debian/bitcoind.examples

This file was deleted.

1 change: 0 additions & 1 deletion contrib/debian/bitcoind.install

This file was deleted.

2 changes: 0 additions & 2 deletions contrib/debian/bitcoind.manpages

This file was deleted.

Loading

0 comments on commit 14ffd72

Please sign in to comment.