ignores for pydev
new vocabulary and other small changes
new ColorDataBuilder algorithm idea: AidedColorDataBuilder
init
Merge pull request #20 from fanatid/qt

Qt GUI
Issue 14: Implement a connector to Electrum

Created electrum.py which has a tcp-only interface into any electrum
tcp/non-ssl server.

utxodb now uses electrum.py to grab raw data.

To use:

electrum_interface = ElectrumInterface(host, port)
utxo = electrum_interface.get_utxo(address)
raw_tx = electrum_interface.get_raw_transaction(tx_id, height)
Merge pull request #21 from jimmysong/14

Issue 14: Implement a connector to Electrum
Fix pointed out by kazcw to get the same results in electrum.py and blockchain.py
Merge pull request #22 from jimmysong/22

Fix pointed out by kazcw to get the same results in electrum.py and bloc...
added raw to CTransaction, removed old stuff
Merge branch 'master' of github.com:bitcoinx/ngcccbase
configurable utxo fetcher
First pass at this. Untested code. Want it committed before I go to sleep and lose my place.
Merge pull request #30 from Ademan/master

Remove source code for python-bitcoinlib and pycoin and add setup.py
change gui, add select wallet/asset
add send page
 GUI update
Merge branch 'qt' of https://github.com/fanatid/ngcccbase
Issue #32: Add support for testnet
Merge pull request #33 from jimmysong/32

Issue #32: Add support for testnet
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	coloredcoinlib/blockchain.py
	utxodb.py