Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2062)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2063)
@@ -3,7 +3,9 @@
 
  2003/05/05: Nadia Tonello
+
    * mfilter/MFCT1SelStandard.cc
      - correct the default name of fImgParName
 	("MNewImgPar") => ("MNewImagePar")
+
 
 
@@ -22,4 +24,31 @@
      - added menu 'Log'
      - changed division of status line to 'Goldener Schnitt'
+
+   * mhist/MHHadronness.cc, mhist/MHCerPhotEvt.cc, mhist/MHStarMap.cc,
+     mimage/MHHillas.cc:
+     - fixed 'redifinion of default argument'
+
+   * mbase/Makefile, mfileio/Makefile:
+     - moved first source file to second position to get rid of crashes
+       of rootcint on our Alpha
+
+   * mimage/MNewImagePar.cc:
+     - removed maxpixid (not used)
+
+   * manalysis/MRanTree.cc:
+     - replaced ostream.h by iostream.h
+
+   * manalysis/MPadding.h:
+     - added a missing const qualifier in the definition of 'Padding'
+
+   * mmontecarlo/MMcEnergyEst.cc:
+     - added math.h
+
+   * Makefile, mbase/Makefile, mmain/Makefile:
+     - changed order (linking on our Alpha failed)
+
+   * mbase/MLog.h:
+     - don't include iostream.h if __CINT__ (crashes rootcint on our
+       alpha)
 
 
Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 2062)
+++ trunk/MagicSoft/Mars/Makefile	(revision 2063)
@@ -35,21 +35,23 @@
 #  ----->>>   mars libraries
 #
-SUBDIRS = mbase       \
-          mmain       \
-          mfileio     \
-          mfilter     \
-          mimage      \
-	  manalysis   \
-          mmc         \
-          meventdisp  \
-          mdatacheck  \
+SUBDIRS = mbase \
+	  mmain \
+          meventdisp \
+          mfileio \
+          mhist \
+          mdatacheck \
+          mgeom \
+          mimage \
+          manalysis \
           mmontecarlo \
-          mhist       \
-          mhistmc     \
-          mdata       \
-          mtools      \
-          mgui        \
-          mgeom       \
-          mraw
+          mmc \
+          mraw \
+          mgui \
+          mdata \
+          mhistmc \
+          mfilter \
+          mtools
+          
+          
 
 LIBRARIES = $(SUBDIRS:=.a)
Index: trunk/MagicSoft/Mars/mbase/MLog.h
===================================================================
--- trunk/MagicSoft/Mars/mbase/MLog.h	(revision 2062)
+++ trunk/MagicSoft/Mars/mbase/MLog.h	(revision 2063)
@@ -9,12 +9,12 @@
 #endif
 
+#ifndef __CINT__
 #include <iostream.h>  // base classes for MLog
+#else
+class streambuf;
+class ostream;
+#endif
 
 #define bsz    160 // two standard lines
-
-enum ELogBits {
-   kHasChanged = BIT(14)  // if gui has changed
-};
-
 
 class TGTextView;
@@ -30,4 +30,8 @@
         eNoColors = 0x400  //BIT(15)
     } Flags_t;
+
+    enum ELogBits {
+       kHasChanged = BIT(14)  // if gui has changed
+    };
 
 private:
Index: trunk/MagicSoft/Mars/mbase/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mbase/Makefile	(revision 2062)
+++ trunk/MagicSoft/Mars/mbase/Makefile	(revision 2063)
@@ -20,5 +20,6 @@
 # @endcode 
 
-INCLUDES = -I. -I../mraw -I../MRawFormat -I../mmc -I../mfileio -I../mmain -I../mfilter
+INCLUDES = -I. -I../mraw -I../MRawFormat -I../mmc -I../mfileio \
+	   -I../mmain -I../mfilter
 
 # @code 
@@ -31,5 +32,6 @@
 .SUFFIXES: .c .cc .cxx .h .hxx .o 
 
-SRCFILES = MLog.cc \
+SRCFILES = MLogo.cc \
+	   MLog.cc \
 	   MParContainer.cc \
 	   MParList.cc \
@@ -50,5 +52,4 @@
            MContinue.cc \
            MPrint.cc \
-           MLogo.cc \
            MLogManip.cc
 
Index: trunk/MagicSoft/Mars/mmain/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mmain/Makefile	(revision 2062)
+++ trunk/MagicSoft/Mars/mmain/Makefile	(revision 2063)
@@ -32,5 +32,4 @@
 SRCFILES = MBrowser.cc \
 	   MEvtDisp.cc \
-	   MStatusDisplay.cc \
 	   MDataCheck.cc \
 	   MMars.cc \
@@ -38,5 +37,6 @@
            MAnalysis.cc \
 	   MMonteCarlo.cc \
-           MProgressBar.cc \
+           MStatusDisplay.cc \
+	   MProgressBar.cc \
            MCameraDisplay.cc