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

This commit is contained in:
Jon Trulson
2019-11-16 16:35:56 -07:00
25 changed files with 610 additions and 537 deletions

View File

@@ -1,8 +1,8 @@
<!-- $TOG: HELPEnt.sgm /main/12 1999/10/12 09:35:15 mgreess $ -->
<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.0a</GlossTerm>,
<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.1</GlossTerm>,
&copy; Copyright 1993-2012 The Open Group
&copy; Copyright 2012-2018 CDE Project contributors, see CONTRIBUTORS for details
&copy; Copyright 2012-2020 CDE Project contributors, see CONTRIBUTORS for details
Project Website: http://cdesktopenv.sourceforge.net/