From: Adar Dembo <adar@vmware.com>
Date: Thu, 18 Sep 2008 01:50:03 +0000 (-0700)
Subject: Merge ssh://git-x.eng.vmware.com/git/opensource/open-vm-tools into yiwen-patches
X-Git-Tag: 2008.10.10-123053~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02adfa5d47f052d5b8519251f0d0cf679b6822e2;p=thirdparty%2Fopen-vm-tools.git

Merge ssh://git-x.eng.vmware.com/git/opensource/open-vm-tools into yiwen-patches
---

02adfa5d47f052d5b8519251f0d0cf679b6822e2
diff --cc open-vm-tools/toolbox/toolbox-cmd.c
index fceea2b46,36aa8cf67..de2255664
--- a/open-vm-tools/toolbox/toolbox-cmd.c
+++ b/open-vm-tools/toolbox/toolbox-cmd.c
@@@ -77,9 -83,8 +84,9 @@@ static void DiskHelp(char *progName)
  static void ScriptHelp(char *progName);
  static void StatHelp(char *progName);
  static void TimeSyncHelp(char *progName);
 +static void RecordHelp(char *progName);
  static void ToolboxCmdHelp(char *progName);
- static const CmdTable * ParseCommand(char **argv, int argc);
+ static CmdTable *ParseCommand(char **argv, int argc);
  static Bool CheckArgumentLength(char **argv, int argc);