Skip to content

Commit e047acd

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents e9db519 + 13c3bde commit e047acd

File tree

5 files changed

+1509
-1464
lines changed

5 files changed

+1509
-1464
lines changed

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
#
88
MUSHCLIENT.HLP
99

10-
#
10+
#
1111
# These two directories are where the object and .exe files are generated
12-
#
12+
#
1313
WinRel
1414
WinDebug
1515

1616
#
1717
# These two files are generated by MUSHclient during testing
18-
#
18+
#
1919
mushclient_prefs.sqlite
2020
MUSHclient.ini
2121

22-
#
22+
#
2323
# These two files are generated during the install, to generate localization files
2424
#
2525
all_files_list.txt
@@ -30,7 +30,7 @@ Localize_template.lua
3030
#
3131
find_non_standard_encoding.lua
3232

33-
#
33+
#
3434
# Compiler work files, editor backups, DLLs used for testing, etc.
3535
#
3636
*.ncb

0 commit comments

Comments
 (0)