Merge branch 'master' into utf8-conversion after 2.3.1 release

2019-11-16 16:34:48 -07:00
parent 2e4deb41c0 9753b63dab
commit ba68ff0a17
152 changed files with 770 additions and 18307 deletions
--- a/cde/config/cf/Motif.tmpl
+++ b/cde/config/cf/Motif.tmpl
@@ -95,7 +95,6 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
 # define XmDefines  /**/
 #endif

-/* To compile without SHAPE extension, set this to -DNO_SHAPE */
 #ifndef MwmDefines
 # define MwmDefines /**/
 #endif