Merge branch 'master' of github.com:jedmccaleb/NewCoin

Conflicts:
	validators.txt
This commit is contained in:
jed
2012-10-19 21:57:11 -07:00
27 changed files with 574 additions and 207 deletions

View File

@@ -58,4 +58,4 @@ public:
int getDataSize() { return iDataSize; }
};
#endif
#endif