diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-04-05 15:08:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-04-05 15:08:46 +0100 |
| commit | 052979a008c733c1eff723d73cbd6536ae0e2f4a (patch) | |
| tree | b03e5eb55b6f8ef0244a5d5ad264fd2afd11f619 /ChangeLog | |
| parent | e736e33dc9a37f16d87d085d2f3aca4c6b40114a (diff) | |
Remove very old merge tag.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -4131,7 +4131,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> |