Merge branch 'master' into autotools-conversion after utf8-conversion

This commit is contained in:
Jon Trulson
2019-11-19 11:44:33 -07:00
460 changed files with 31613 additions and 31567 deletions

View File

@@ -19,5 +19,6 @@ XCOMM $XConsortium: Imakefile /main/6 1996/12/17 19:30:25 rws $
#define HasTerminal
#define HasTextedit
#define BuildingDocs YES
#include "../../../programs/localized/templates/French.tmpl"
#include "../../common/help/Imakefile.tmpl"