Sergei Trofimovich ff4de3d66f Merge branch 'mc-4.6' into 147_escaping ... * mc-4.6: replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() fixed out-of-tree-builds Updated the NEWS file for 4.6.2 and added the bugnumbers behind the items in the list. Update for OpenOffice and StarOffice viewer. changelog: added entry for python syntax syntax: python: keywords update (patch by NNemec) fixes #216 AC_USE_SYSTEM_EXTENSIONS macro requires autoconf >= 2.60 po/ru.po: In russian translation, there are some hotkey conficts in menu. ChangeLog/NEWS: added entry for #181 ticket (copy to deleted dir) Now a trailing slash will only be added in copy & move dialogs if the path itselfs copy/move dialog: add trailing '/' to default destination path (fix #181) fixed comments to /* ... */ Not only comment it out but removing it Removed unneeded var to make build process a bit cleaner Add code snipplet by il.smind which should fix issues with putty and Conflicts: ChangeLog mhl/string.h src/command.c src/complete.c src/file.c src/util.c		2009-01-31 22:18:19 +02:00
..
.gitignore
bookmark.c
ChangeLog
choosesyntax.c
edit-widget.h
edit.c	replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()	2009-01-31 16:51:58 +01:00
edit.h	in file edit/edit.[ch]	2009-01-09 01:33:17 +02:00
editcmd.c	Merge branch 'mc-4.6' into 147_escaping	2009-01-31 22:18:19 +02:00
editcmddef.h
editdraw.c	Move this var into if condition as it's only needed there	2009-01-14 23:28:35 +01:00
editkeys.c
editlock.c	Removed some unused vars and functions	2009-01-12 22:47:05 +01:00
editlock.h
editmenu.c
editoptions.c
editwidget.c	replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()	2009-01-31 16:51:58 +01:00
Makefile.am	fixed out-of-tree-builds	2009-01-30 16:46:44 +01:00
syntax.c	replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()	2009-01-31 16:51:58 +01:00
usermap.c	replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file()	2009-01-31 16:51:58 +01:00
usermap.h
wordproc.c