Merge remote-tracking branch 'origin/master'

nickgammon · Jan 7, 2017 · e047acd · e047acd
2 parents e9db519 + 13c3bde
commit e047acd
Show file tree

Hide file tree

Showing 5 changed files with 1,509 additions and 1,464 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,19 +7,19 @@
 #
 MUSHCLIENT.HLP
 
-#
+# 
 #  These two directories are where the object and .exe files are generated
-#
+# 
 WinRel
 WinDebug
 
 #
 #  These two files are generated by MUSHclient during testing
-#
+# 
 mushclient_prefs.sqlite
 MUSHclient.ini
 
-#
+# 
 #  These two files are generated during the install, to generate localization files
 #
 all_files_list.txt
@@ -30,7 +30,7 @@ Localize_template.lua
 #
 find_non_standard_encoding.lua
 
-#
+# 
 #  Compiler work files, editor backups, DLLs used for testing, etc.
 #
 *.ncb