updated: [a1b4718] manually merged 118_port_number_in_shell_link

["Enrico Weigelt, metux IT service" <weigelt metux de>]

The following commit has been merged in the master branch:
commit a1b47185c952e9d31607d59420a0cb86e9f492ab
Merge: 5f77615b35a09d8cb1941b0d37f5cf24d4b7dbc5 a73bd631e57d6f9ee89f3a3fc1870fa879b01fb0
Author: Enrico Weigelt, metux IT service <weigelt metux de>
Date:   Sat Jan 31 19:29:15 2009 +0100

    manually merged 118_port_number_in_shell_link

diff --combined ChangeLog
index 3d714e5,727c875..cc5b4da
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,31 -1,9 +1,36 @@@
 +2009-01-31 Enrico Weigelt, metux ITS <weigelt metux de>
 +
 +	* replaced buggy concat_dir_and_file() by mhl_str_dir_plus_file() (in mhl/string.h)
 +
 +2009-01-30 Enrico Weigelt, metux ITS <weigelt metux de>
 +
 +	* src/Makefile.am, edit/Makefile.am vfs/Makefile.am: fixed #208
 +	  (out-of-tree builds)
 +
 +2009-01-29 Mikhail S. Pobolovets <styx mp gmail com>
 +	* lib/mc.ext.in: update for OpenOffice and StarOffice viewer.
 +	  odt2txt is now used
 +
 +2009-01-29 Patrick Winnertz <winnie debian org> & Sergei Trofimovich  <slyfox inbox ru>
 +
 +	* src/file.c: Added trailing dir separator for default path in copy/move dialogs.
 +	  This solves "strange" rename cases, when copying/moving is performed into
 +	  deleted directory.
 +
 +2009-01-27 Enrico Weigelt, metux IT service <weigelt metux de>
 +
 +	* mhl/escape.h, mhl/string.h: fixed comments to use /* ... */
 +
 +2009-01-27 Sergei Trofimovich  <slyfox inbox ru>
 +
 +	* syntax/python.syntax: Added syntax highlighting for
 +	pytnoh-2.6+ keywords (patch sent by NNemec)
  
+ 2009-01-26 Mikhail S. Pobolovets <styx mp gmail com>
+ 
+ 	* vfs/fish.c: Iterpret SUP.flags as port number if SUP.flags is not in
+ 	  0, FISH_FLAG_COMPRESSED and FISH_FLAG_RSH. Weakness: port number
+ 
  2009-01-25 Ilia Maslakov <il smind gmail com>
  
  	* src/boxes.c, src/boxes.h, src/dir.c, src/dir.h:
@@@ -37,10 -15,6 +42,10 @@@
  	* mhl/string.h, vfs/fish.c, vfs/utilvfs.c, vfs/utilvfs.h: Reworked fish code
  	  so that symlinks and files which special characters works now
  
 +2009-01-25 Mikhail S. Pobolovets <styx mp gmail com>
 +	* src/cmd.c src/option.c src/setup.c src/main.h: Automatic new directory(Mkdir, F7)
 +	  name filling. Can be configured (on|off) in 'Configure options'
 +
  2009-01-25 Enrico Weigelt <weigelt metux de>
  
  	* edit/editcmd.c, src/cmd.c, src/ext.c, src/history.h:

-- 
Midnight Commander Development