From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Tue, 5 Apr 2016 19:39:27 +0000 (-0400)
Subject: Merge pull request #397 in SNORT/snort3 from perf_maccpu to master
X-Git-Tag: 3.0.0-233~477
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccb2deddb542380f50ea6a0b506f419d1bc15ecf;p=thirdparty%2Fsnort3.git

Merge pull request #397 in SNORT/snort3 from perf_maccpu to master

* commit '482227d99c993194d4239a816e149345e6a99800':
  added support for OSX thread timekeeping. fixed accuracy errors in perfmon cpu
  fixed mac issues
---

ccb2deddb542380f50ea6a0b506f419d1bc15ecf