Merge branch 'master' into cde-next

Need to resync before folding current cde-next into master.
This commit is contained in:
Jon Trulson
2018-07-06 13:19:33 -06:00
7 changed files with 373 additions and 312 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.2.4a</GlossTerm>,
<!ENTITY CDEcopyright "<GlossTerm Role=nogloss>Common Desktop Environment 2.3.0</GlossTerm>,
&copy; Copyright 1993-2012 The Open Group
&copy; Copyright 2012-2016 CDE Project contributors, see CONTRIBUTORS for details
&copy; Copyright 2012-2018 CDE Project contributors, see CONTRIBUTORS for details
Project Website: http://cdesktopenv.sourceforge.net/