update change log

diff --git a/ChangeLog b/ChangeLog
index 05f7d8c0ca2986d0e30c4374afdc525110c85ddb..94ac4b497c81c392d52b503ef5c45214a14e4c4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@
 -- added snort.detach() and fixed -j parsing
 -- various parsing changes for improved error handling
 -- fixed some Xcode analyzer issues
+-- pulled in cmake updates from Josh
+-- pulled in nhttp updates from Tom
 
 122
 -- pulled thread pinning from Josh