ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-03 09:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source 
Conflicts:
	Builds/VisualStudio2013/RippleD.vcxproj
	Builds/VisualStudio2013/RippleD.vcxproj.filters
	Builds/rpm/rippled.spec
	src/ripple/app/misc/NetworkOPs.cpp
	src/ripple/app/tx/impl/TransactionEngine.cpp
	src/ripple/protocol/impl/BuildInfo.cpp
	src/ripple/unity/app_tx.cpp
This commit is contained in:
Vinnie Falco
2015-07-07 09:35:41 -07:00
parent fed3f7b74b 6374aad9bc
commit 097a8ce640
14 changed files with 113 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ripple/app/misc/NetworkOPs.cpp
View File

@@ -152,7 +152,7 @@ public:
private:
std::uint32_t getCloseTimeNC (int& offset) const;
bool isValidated (std::uint32_t seq, uint256 const& hash) /*override*/;
bool isValidated (std::uint32_t seq, uint256 const& hash);
public:
void closeTimeOffset (int) override;