mirror of
https://gitlab.com/etherlab.org/ethercat.git
synced 2026-08-18 17:17:23 +08:00
Merge branch 'devel-1.6' into ethercat-backport_setip
This commit is contained in:
+3
-5
@@ -1,6 +1,4 @@
|
||||
/*****************************************************************************
|
||||
*
|
||||
* $Id$
|
||||
*
|
||||
* Copyright (C) 2006-2009 Florian Pose, Ingenieurgemeinschaft IgH
|
||||
*
|
||||
@@ -64,7 +62,7 @@ using namespace std;
|
||||
|
||||
#include "MasterDevice.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
/****************************************************************************/
|
||||
|
||||
typedef list<Command *> CommandList;
|
||||
CommandList commandList;
|
||||
@@ -86,7 +84,7 @@ bool helpRequested = false;
|
||||
string outputFile;
|
||||
string skin;
|
||||
|
||||
/*****************************************************************************/
|
||||
/****************************************************************************/
|
||||
|
||||
string usage()
|
||||
{
|
||||
@@ -132,7 +130,7 @@ string usage()
|
||||
return str.str();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/****************************************************************************/
|
||||
|
||||
void getOptions(int argc, char **argv)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user