X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fmsg%2Ftxt;h=bf7794b37f6816a5eb7d4809bb285b8663718cbf;hb=refs%2Ftags%2F2023-04;hp=911fc5e11375c33a8cb405c6eb44f3d5638645fc;hpb=b7fd8ccc37991c54a154a7c858da0c70188f7284;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index 911fc5e1..bf7794b3 100644
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -3,6 +3,19 @@ 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 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
+  Libjpeg-turbo upgraded to 2.1.5.1
+  Libvpx is now upgraded to 1.13.0
+2023 February changes of note:
+  GPL headers have been added to essentially all program 
+   files with contributor attribution for CV or known author.
 2023 January changes of note:
   New shell script added to delete background render files
    that exist on /tmp named brenderX.