Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 1743)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 1744)
@@ -1,22 +1,37 @@
 
                                                          -*-*- END -*-*-
-
- 2003/01/31  Antonio Stamerra & Marcos Lopez
-
-  * mgui/MCamDisplay.[cc|h]
-    - Added a new function MCamDisplay::SetPix(const Int_t pixnum, const Int_t
-   color, Float_t min, Float_t max) which just set the color of a given pixel 
-
-  * created two new classes for simulating the second level trigger in the 
-    directory MAnalysis:
-    - MTrigLvl2.[cc|h]         // Implement the Lvl2 topology and selection
-                               // strategies
-    - MTrigLvl2FillTask.[cc|h] // For a given MMc event, fill the MTrigLvl2 
-                                  with the Lvl1 trigger information 
-
-  * manalysis/Makefile
-    - Added -I../mgui
-
-  * Added macro macros/triglvl2.C which uses the above classes.
+ 2003/02/06: Thomas Bretz
+
+   * mbase/MLog.[h,cc]:
+     - serialized the GUI output (problems with mutithreded prgs, eg Cosy)
+
+   * mtemp/MObservatoryLocation.[h,cc], mtemp/MVPObject.[h,cc],
+     mtemp/MVPPlotter.[h,cc]:
+     - added changes discussed in Wuerzburg
+
+   * mfileio/MCT1ReadPreProc.cc:
+     - some simplifications
+
+
+
+ 2003/01/31: Antonio Stamerra & Marcos Lopez
+
+    * mgui/MCamDisplay.[cc|h]
+      - Added a new function MCamDisplay::SetPix(const Int_t pixnum, 
+        const Int_t color, Float_t min, Float_t max) which just set the 
+        color of a given pixel 
+
+    * created two new classes for simulating the second level trigger in the 
+      directory manalysis:
+      - MTrigLvl2.[cc|h]         // Implement the Lvl2 topology and selection
+                                 // strategies
+      - MTrigLvl2FillTask.[cc|h] // For a given MMc event, fill the MTrigLvl2 
+                                    with the Lvl1 trigger information 
+
+    * manalysis/Makefile
+      - Added -I../mgui
+
+    * Added macro macros/triglvl2.C which uses the above classes.
+
 
 
@@ -31,4 +46,6 @@
       processing a new run header
 
+
+
  2003/01/23: Robert Wagner
 
@@ -36,5 +53,6 @@
     - MSigmabarCalc::Process()
       Replaced fMcEvt->GetTheta() by fMcEvt->GetTelescopeTheta()
-  
+
+
 
  2003/01/20: Oscar Blanch
@@ -145,7 +163,13 @@
       	otherwise, we got a compilation error in Alpha machines.
 
+<<<<<<< Changelog
+
+
+ 2002/12/13: Oscar Blanch
+=======
 
 
  2002/12/13: Oscar blanch
+>>>>>>> 1.369
 
     * mgeom/MGeomMirror.[h,cc]