Update Changelogs

cobc/ChangeLog

@@ -71,10 +71,7 @@
 
 2024-02-26  Boris Eng <[email protected]>
 
-	FR #488: thread-safety for string handling using state vars
-	* parser.y (examine_format_variant, inspect_region), typeck.c:
-	  function calls of strings functions have been replaced by calls to
-	  thread-safe versions
+	* codegen.c (output_data): handle CB_TAG_DIRECT in output_data function
 
 2024-02-19  Boris Eng <[email protected]>
 

libcob/ChangeLog

@@ -123,15 +123,8 @@
 	* common.c: add missing include libxml/parser.h
 
 2024-02-26  Boris Eng <[email protected]>
-
-<<<<<<< HEAD
-	* coblocal.h (cob_exit_strings_mt): add multithreaded version of
-	  cob_exit_strings
-=======
 	FR #488: thread-safety for string handling using state vars
->>>>>>> 3224291 (Revert changes: remove allocated states and use full static states for strings)
-	* common.h (cob_inspect_state, cob_string_state, cob_unstring_state),
-	  strings.c: moved static variables to structures
+	* strings.c: moved static variables to structures
 
 2024-01-25  David Declerck <[email protected]>