Merge pull request #350 from UdjinM6/v0.12.0.x_budget

V0.12.0.x budget fixes/cleanups
This commit is contained in:
evan82 2015-06-06 08:14:44 -06:00
commit cddd69ef40
2 changed files with 689 additions and 713 deletions

File diff suppressed because it is too large Load Diff

View File

@ -38,7 +38,6 @@ extern std::map<uint256, CFinalizedBudgetVote> mapSeenFinalizedBudgetVotes;
extern CBudgetManager budget;
void DumpBudgets();
void GetMasternodeBudgetEscrow(CScript& payee);
//Amount of blocks in a months period of time (using 2.6 minutes per)
int GetBudgetPaymentCycleBlocks();
@ -498,4 +497,4 @@ public:
};
#endif
#endif