Merge branch 'master' into feature/nocopy

2 files changed, 5 insertions, 1 deletions

diff --git a/pc/ChangeLog b/pc/ChangeLog
index 8d844018..2b4b1183 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* General: Remove trailing whitespace from all relevant files.
+
 2016-09-24  Eli Zaretskii  <eliz@gnu.org>
 
 	Fix compilation warnings on MinGW with the latest runtime.
diff --git a/pc/popen.c b/pc/popen.c
index 73770d98..425d32b9 100644
--- a/pc/popen.c
+++ b/pc/popen.c
@@ -104,7 +104,7 @@ scriptify(const char *command)
     free(cmd);
     cmd = NULL;
   }
-  if (fp) fclose(fp); 
+  if (fp) fclose(fp);
   return(cmd);
 }