+2018-04-10 Carl Hetherington <cth@carlh.net>
+
+ * Fix disappearing subtitles when they are added from text files
+ alongside video content which also contain subtitles (#1271).
+
+2018-04-06 Carl Hetherington <cth@carlh.net>
+
+ * Fix missing start icon for the player in Linux.
+
2018-04-05 Carl Hetherington <cth@carlh.net>
+ * Updated zh_CN translation from 刘汉源.
+
* Fix crash on startup if there are no audio devices (#1265).
* Fix non-working arrow keys / space in text fields (#1263).
* 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>