From f914f1a746d7f91951c1da262a4a749dd3ebfa71 Mon Sep 17 00:00:00 2001
From: sandakersmann <mkjaerstad@yahoo.no>
Date: Wed, 17 Dec 2014 02:47:57 +0100
Subject: Added "Core" to copyright headers

Github-Pull: #5494
Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
---
 src/timedata.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/timedata.h')

diff --git a/src/timedata.h b/src/timedata.h
index 64595ffc37..2296baf11b 100644
--- a/src/timedata.h
+++ b/src/timedata.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 The Bitcoin developers
+// Copyright (c) 2014 The Bitcoin Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-- 
cgit v1.2.3


From e1523cee5808bb792cd99f037f06b736af4e23fb Mon Sep 17 00:00:00 2001
From: mruddy <mruddy@users.noreply.github.com>
Date: Tue, 29 Mar 2016 14:40:00 +0000
Subject: P2P: add maxtimeadjustment command line option

---
 src/timedata.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/timedata.h')

diff --git a/src/timedata.h b/src/timedata.h
index 2296baf11b..9f2499c85c 100644
--- a/src/timedata.h
+++ b/src/timedata.h
@@ -10,6 +10,8 @@
 #include <stdint.h>
 #include <vector>
 
+static const int64_t DEFAULT_MAX_TIME_ADJUSTMENT = 70 * 60;
+
 class CNetAddr;
 
 /** 
-- 
cgit v1.2.3