Merge branch '1649_code_cleanup'
commitb0521566bbe31bc658d3cad8a757b076c3485b23
authorSlava Zanko <slavazanko@gmail.com>
Wed, 30 Sep 2009 13:44:05 +0000 (30 16:44 +0300)
committerSlava Zanko <slavazanko@gmail.com>
Wed, 30 Sep 2009 13:44:05 +0000 (30 16:44 +0300)
tree6c7fe0e1c90834752389d078657d3b998277328e
parent4c643401114698217418b21482875d60f3b61664
parent294a5ed6a1c2cb08960a1a2c1df1842ea34aefd4
Merge branch '1649_code_cleanup'

* 1649_code_cleanup:
  Fix Makefile.am for correct run 'make dist' command
  Fix conflict of hotkeys in main menu.
  Ticket #1649: Prepare for prerelease mc-4.7.0-pre3 (code cleanup)