Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync develop with master #639

Merged
merged 20 commits into from Oct 27, 2014
Merged

sync develop with master #639

merged 20 commits into from Oct 27, 2014

Conversation

bonesoul
Copy link
Owner

No description provided.

bonesoul added 20 commits October 21, 2014 14:19
…ture/markets

Conflicts:
	src/CoiniumServ/packages.config
NetworkInfo.cs can now also read coins per block reward.
ProfitInfo.cs can now calculate profits.
…ture/markets

Conflicts:
	src/CoiniumServ/Container/Registries/ClassRegistry.cs
Implemented profitability section in pool view.
Fixed tests against generationtransaction version change - c441673.
bonesoul pushed a commit that referenced this pull request Oct 27, 2014
@bonesoul bonesoul merged commit c4cd699 into develop Oct 27, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant