X-Git-Url: https://cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fmsg%2Ftxt;h=704c06c6dcce7da40742cda0894719e15dfbaa9c;hb=e6b185e4309d5f1d0c70d1d16079a5d32b7e67e2;hp=bf7794b37f6816a5eb7d4809bb285b8663718cbf;hpb=877396efab247de96877d418d1a4ee9ef6474c32;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index bf7794b3..704c06c6 100644
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -3,11 +3,10 @@ For usage help, refer to the following:
   https://cinelerra-gg.org/download/CinelerraGG_Manual.pdf
   http://g-raffa.eu/Cinelerra/HOWTO/basics.html
 .
-<<<<<<< HEAD
+2023 June changes of note:
+  Capability to create DVDs with BFF interlace added.
 2023 April changes of note:
   X264 has been upgraded to r3106 stable release. 
-=======
->>>>>>> 3a4fc0d9ea25818f9de852a0a7e3eab22ceaaebd
 2023 March changes of note:
   Flac has been upgraded to 1.4.2
   Tiff has been upgraded to 4.5.0