This commit updates master at de82eebdd5 to include bits from Message-Id: <1344951117-33716-3-git-send-email-saper@saper.info> http://thread.gmane.org/gmane.comp.desktop.cde.devel/283/focus=301 not included in the Message-Id: <1344951117-33716-1-git-send-email-saper@saper.info> http://thread.gmane.org/gmane.comp.desktop.cde.devel/283/focus=299 that was commited as d3206f4514 Also remove two generated files from the repository: programs/dtksh/ksh93/man/man1/sh.1 programs/dtksh/ksh93/man/man3/nval.3 Conflicts: cde/programs/dtksh/ksh93/Imakefile
de82eebdd5
d3206f4514