From 4504760b41d5bc2230c3d6316627028040fb3ec5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 27 Jul 2011 22:09:12 +0000 Subject: [PATCH] 2011-07-28 00:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! -hbcc help description cleanup as suggested by Phil Krylov --- harbour/ChangeLog | 6 +++++- harbour/utils/hbmk2/hbmk2.prg | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5a482672bc..6bf7dda613 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2011-07-28 00:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * utils/hbmk2/hbmk2.prg + ! -hbcc help description cleanup as suggested by Phil Krylov + 2011-07-26 13:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/ChangeLog * changed [TOMERGE 3.0] status to [MERGED 3.0] @@ -33,7 +37,7 @@ 2011-07-25 13:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idemain.prg - + Implemented: Order of "Functions List" is remembered as per + + Implemented: Order of "Functions List" is remembered as per last setting initiated by the user via context menu. The order can be "Natural" or "Ascending". diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index b68f5d08b1..653803c370 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -12246,7 +12246,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong ) { "-hbrun" , I_( "run target" ) },; { "-hbraw" , I_( "stop after running Harbour compiler" ) },; { "-hbcmp|-clipper" , I_( "stop after creating the object files\ncreate link/copy hbmk2 to hbcmp/clipper for the same effect" ) },; - { "-hbcc" , I_( "stop after creating the object files and accept raw C flags\ncreate link/copy hbmk2 to hbcc for the same effect" ) },; + { "-hbcc" , I_( "accept raw C flags\ncreate link/copy hbmk2 to hbcc for the same effect" ) },; { "-hblnk" , I_( "accept raw linker flags" ) },; { "-autohbm[-]" , hb_StrFormat( I_( "enable (or disable) processing of %1$s in current directory (default: yes)" ), _HBMK_AUTOHBM_NAME ) },; { "-hb10" , I_( "enable Harbour 1.0.x compatibility mode" ) },;