Use my coin collection and current difficulty to estimate time until next staking.
Update optionsmodel.cpp

missing ';'
GetWeight() already takes nStakeMinAge into account. Don't do it twice.
Allow outputs to merge even if they're from the same transaction as the staked output.
Fix indentation.
Add in walletimportdat option. Works, but requires testing
Merge pull request #26 from l0rdicon/wallet-import

Add in walletimportdat option. Works, but requires testing
[Qt] remove broken OptionsModel::Upgrade()
Merge branch 'staging' of https://github.com/l0rdicon/clams into staging

Conflicts:
	src/qt/optionsmodel.cpp
Merge branch 'staging' of https://github.com/nochowderforyou/clams into staging
Updates to the make system. Move into precise and bumb the dependicnes to newer version
Merge pull request #29 from l0rdicon/staging

Updates to the make system. Move into precise and bumb the dependices t...
updates to makefile for qt
Merge pull request #30 from l0rdicon/staging

updates to makefile for qt
Fix divide by zero bug.
Bignum doesn't have a bool cast?
updates to importwalletdat, ScanForWalletTransactions no accepts a bool fImport to bypass metadata checking on a wallet import. Otherwise a rescan may not occur
importwalletdat now returns an error when file is not found and not longer creates a new wallet file
Merge pull request #32 from l0rdicon/staging

some fixed for importwalletdat. Error returned now when wallet file is not found and ScanForWalletTransactions was modified to accept a bool for when a wallet is being imported. It skips a section that can cause rescanning not to properly occur
Merge pull request #33 from dooglus/fix-combine

Fix combine