<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
  img {
    max-width: 100%;
    height: auto;
  }
  p.details {
    font-style:italic;
    color:#777
  }
  .footer p {
    font-size:small;
    color:#777
  }
  pre.commit-message {
    white-space: pre-wrap;
  }
  .file-stats a {
    text-decoration: none;
  }
  .file-stats .new-file {
    color: #090;
  }
  .file-stats .deleted-file {
    color: #B00;
  }
</style>
<body>
<div class='content'>
<h3>Hal Murray pushed to branch master at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/9c0e0d5b5f848332e1e30b36b057f68888dbc2c7">9c0e0d5b</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2015-12-05T05:21:04Z</i>
</div>
<pre class='commit-message'>Grumph.  Back out of the rest of my previous change.</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/bd5d415be03931db628b16c7c571778ef945a536">bd5d415b</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2015-12-05T05:25:40Z</i>
</div>
<pre class='commit-message'>Merge branch 'master' of gitlab.com:NTPsec/ntpsec</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
pylib/refclock.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/7ed56e320f26b35f31990984611e7e16bd70d948...bd5d415be03931db628b16c7c571778ef945a536#diff-0'>
<strong>
pylib/refclock.py
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/pylib/refclock.py
</span><span style="color: #000000;background-color: #ddffdd">+++ b/pylib/refclock.py
</span><span style="color: #aaaaaa">@@ -80,6 +80,7 @@ refclock_map = {
</span>   22: {
                "descr":      "PPS Clock Discipline",
                "define":     "CLOCK_ATOM",
<span style="color: #000000;background-color: #ddffdd">+                "require":    ["ppsapi"],
</span>           "file":               "atom"
        },
 
</code></pre>

<br>
</li>

</div>
<div class='footer' style='margin-top: 10px;'>
<p>

<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/7ed56e320f26b35f31990984611e7e16bd70d948...bd5d415be03931db628b16c7c571778ef945a536">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can adjust your notification settings.

</p>
</div>
</body>
</html>