.gitignore: update
Auto-recognition of RSA padding bug for ProFTPD.
fix Mantis #0002632: Moving/renaming (F6) any file on FTP (SFTP) doesn't work properly
class COpData : public TObject
refactoring: move 'define CUSTOM_MEM_ALLOCATION_IMPL' to nbglobals.h
rtti.hpp: remove stray semicolon
refactoring: move include <FastDelegate.h> to CoreDefs.hpp
refactoring: filezilla: inherit base classes from TObject
refactoring: filezilla: use CUSTOM_MEM_ALLOCATION_IMPL
refactoring: add TFarDialogItem::GetStartupInfo()
refactoring: TFarDialogItem
refactoring: rename const UnicodeString & FileName --> const UnicodeString & AFileName
refactoring: mark static functions
version info: update
Merge branch 'master' into far3

* master:
  version info: update
  refactoring: mark static functions
  refactoring: rename const UnicodeString & FileName --> const UnicodeString & AFileName
  refactoring: TFarDialogItem
  refactoring: add TFarDialogItem::GetStartupInfo()
  refactoring: filezilla: use CUSTOM_MEM_ALLOCATION_IMPL
  refactoring: filezilla: inherit base classes from TObject
  refactoring: move include <FastDelegate.h> to CoreDefs.hpp
  rtti.hpp: remove stray semicolon
  refactoring: move 'define CUSTOM_MEM_ALLOCATION_IMPL' to nbglobals.h
  class COpData : public TObject
  fix Mantis #0002632: Moving/renaming (F6) any file on FTP (SFTP) doesn't work properly
  Auto-recognition of RSA padding bug for ProFTPD.
  .gitignore: update

Conflicts:
	src/NetBox/FarDialog.cpp
	src/NetBox/FarDialog.h
	src/NetBox/FarPlugin.cpp
	src/NetBox/FarPlugin.h
	src/NetBox/WinSCPFileSystem.cpp
	src/NetBox/WinSCPFileSystem.h
try to fix Mantis #0002479: FTP: plugin hangs up if file is read-protected

(http://bugs.farmanager.com/view.php?id=2479)
Merge branch 'master' into far3

* master:
  try to fix Mantis #0002479: FTP: plugin hangs up if file is read-protected