diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-04-05 16:30:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-04-05 16:30:51 +0100 |
| commit | 2cbf72995ce53ed92545dbcd3fb07788d68ff7f2 (patch) | |
| tree | 1c1e71dc52c63351083aab4538c0693b5a7c0442 | |
| parent | f219a53380fcc7facc5915ddc85ff8d8187647a1 (diff) | |
Fix old merge artefact.
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -4093,7 +4093,6 @@ * 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> |