Fix old merge artefact.
authorCarl Hetherington <cth@carlh.net>
Thu, 5 Apr 2018 15:30:51 +0000 (16:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 5 Apr 2018 15:30:51 +0000 (16:30 +0100)
ChangeLog

index 524b97e..bd54422 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
        * Attempt to fix random crashes on OS X (especially during encodes)
        thought to be caused by multiple threads using (different) stringstreams
        at the same time; see src/lib/safe_stringstream.
->>>>>>> origin/master
 
 2014-08-09  Carl Hetherington  <cth@carlh.net>