diff options
| author | Petr Mladek <pmladek@suse.cz> | 2012-11-05 14:34:27 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-11-05 14:34:27 +0100 |
| commit | ef15a5a4acd3174752484c6aeb570d4d6444b645 (patch) | |
| tree | 3d1d5b58f85737aa46241aea4c4dabea520cecc2 /desktop/source/app/cmdlinehelp.hxx | |
| parent | a1b0ce05e851e9724c046888a01869eddf9e9db2 (diff) | |
| parent | c309ce0227a14330094191c1ef15fa00899defcb (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6
Conflicts:
desktop/source/app/sofficemain.cxx
instsetoo_native/util/openoffice.lst
solenv/inc/minor.mk
Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e
Diffstat (limited to 'desktop/source/app/cmdlinehelp.hxx')
| -rw-r--r-- | desktop/source/app/cmdlinehelp.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/app/cmdlinehelp.hxx b/desktop/source/app/cmdlinehelp.hxx index 5c92512ea1e9..fbf520af7521 100644 --- a/desktop/source/app/cmdlinehelp.hxx +++ b/desktop/source/app/cmdlinehelp.hxx @@ -5,7 +5,7 @@ namespace desktop { - void displayCmdlineHelp( void ); + void displayCmdlineHelp( rtl::OUString const & unknown ); void displayVersion(); #ifndef UNX class CmdlineHelpDialog : public ModalDialog |