Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8903)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8904)
@@ -18,4 +18,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+
+ 2008/06/01 Thomas Bretz
+
+   * callisto.cc, star.cc:
+     - renamed new option to "--null-dev" (clashes with MLog options)
+
 
 
Index: trunk/MagicSoft/Mars/NEWS
===================================================================
--- trunk/MagicSoft/Mars/NEWS	(revision 8903)
+++ trunk/MagicSoft/Mars/NEWS	(revision 8904)
@@ -84,5 +84,5 @@
       If the trigger pattern is corrupted events won't pass anymore.
 
-    * Added a new command line option --null to suppress output of
+    * Added a new command line option --dev-null to suppress output of
       Y-files (this is useful for test cases)
 
@@ -91,5 +91,5 @@
     * the star file now contains also the sequence information
 
-    * Added a new command line option --null to suppress output of
+    * Added a new command line option --dev-null to suppress output of
       I-files (this is useful for test cases)
 
Index: trunk/MagicSoft/Mars/callisto.cc
===================================================================
--- trunk/MagicSoft/Mars/callisto.cc	(revision 8903)
+++ trunk/MagicSoft/Mars/callisto.cc	(revision 8904)
@@ -78,5 +78,5 @@
     gLog << "   --path=path               Path to write the all results to [def=local path]" << endl;
     gLog << "                             (overwrites --iny, --outc and --outy)" << endl;
-    gLog << "   --null                    Suppress output of Y-files (for test purpose)" << endl;
+    gLog << "   --dev-null                Suppress output of Y-files (for test purpose)" << endl;
     gLog << "   --print-seq               Print Sequence information" << endl;
     gLog << "   --print-files             Print Files taken from Sequence" << endl;
@@ -175,5 +175,5 @@
     const Bool_t  kMovie      = arg.HasOnlyAndRemove("--movie");
     const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
-    const Bool_t  kNullOut    = arg.HasOnlyAndRemove("--null");
+    const Bool_t  kNullOut    = arg.HasOnlyAndRemove("--dev-null");
 //          Bool_t  kMoon       = arg.HasOnlyAndRemove("--moon");
     Int_t kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0;
Index: trunk/MagicSoft/Mars/star.cc
===================================================================
--- trunk/MagicSoft/Mars/star.cc	(revision 8903)
+++ trunk/MagicSoft/Mars/star.cc	(revision 8904)
@@ -68,5 +68,5 @@
     gLog << "   --out=path                Path to write the all results to [def=local path]" << endl;
     gLog << "                             (overwrites --outc and --outy)" << endl;
-    gLog << "   --null                    Suppress output of I-files (for test purpose)" << endl;
+    gLog << "   --dev-null                Suppress output of I-files (for test purpose)" << endl;
     gLog << "   --no-muons                Switch off Muon analysis (for fast tests)" << endl;
     gLog << "   --print-seq               Print Sequence information" << endl;
@@ -122,5 +122,5 @@
     const Bool_t  kPrintFound = arg.HasOnlyAndRemove("--print-found");
     const Bool_t  kDebugMem   = arg.HasOnlyAndRemove("--debug-mem");
-    const Bool_t  kNullOut    = arg.HasOnlyAndRemove("--null");
+    const Bool_t  kNullOut    = arg.HasOnlyAndRemove("--dev-null");
     Int_t  kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0;
     kDebugEnv = arg.GetIntAndRemove("--debug-env=", kDebugEnv);