Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2738)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2739)
@@ -4,4 +4,40 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2003/12/21: Thomas Bretz
+
+   * mcalib:
+     - new directory containing all MCalib* and MHCalib* classes
+
+   * manalysis/MCalib*:
+     - moved to mcalib
+
+   * mhist/MHCalib*:
+     - moved to mcalib
+
+   * Makefile:
+     - added mcalib
+
+   * manalysis/Makefile, manalysis/AnalysisLinkDef.h:
+     - removed MCalib*
+
+   * mhist/Makefile, mhist/HistLinkDef.h:
+     - removed MHCalib*
+
+   * mhbase:
+     - new directory containing base classes for histogram stuff
+
+   * mhist/MFillH.[h,cc], mhist/MBinning.[h,cc], mhist/MWeight.[h,cc],
+     mhist/MH.[h,cc], mhist/MH3.[h,cc], mhist/MHArray.[h,cc],
+     mhist/MHMatrix.[h,cc]:
+     - moved to mhbase
+
+   * mhist/Makefile, mhist/HistLinkDef.h:
+     - removed MFillH, MBinning, MWeight, MH, MH3, MHMatrix and MHArray
+
+   * */Makefile:
+     - updated include paths accordingly
+
+
+
  2003/12/20: Abelardo Moralejo
 
@@ -17,4 +53,6 @@
    * mmc/MMcFadcHeader.hxx
      - added getter function for fAmplitudOuter.
+
+
 
  2003/12/20: Thomas Bretz
Index: trunk/MagicSoft/Mars/Makefile
===================================================================
--- trunk/MagicSoft/Mars/Makefile	(revision 2738)
+++ trunk/MagicSoft/Mars/Makefile	(revision 2739)
@@ -40,4 +40,5 @@
           mfilter \
           mdata \
+          mhbase \
           mhist \
           manalysis \
Index: trunk/MagicSoft/Mars/manalysis/Makefile
===================================================================
--- trunk/MagicSoft/Mars/manalysis/Makefile	(revision 2738)
+++ trunk/MagicSoft/Mars/manalysis/Makefile	(revision 2739)
@@ -24,6 +24,6 @@
 INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
 	   -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
-           -I../mhistmc -I../mfileio -I../mmain
-
+           -I../mhistmc -I../mfileio -I../mmain -I../mcalib
+# mcalib: MGeomApply (MCalibrationCam)
 
 #------------------------------------------------------------------------------
Index: trunk/MagicSoft/Mars/mranforest/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mranforest/Makefile	(revision 2738)
+++ trunk/MagicSoft/Mars/mranforest/Makefile	(revision 2739)
@@ -22,5 +22,5 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mhist -I../mdata -I../manalysis -I../mmc
+INCLUDES = -I. -I../mbase -I../mhbase -I../mdata -I../manalysis -I../mmc
 #               MParContainer MH     MDataArray MHadronness    MMcEvt
 
Index: trunk/MagicSoft/Mars/mtools/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mtools/Makefile	(revision 2738)
+++ trunk/MagicSoft/Mars/mtools/Makefile	(revision 2739)
@@ -22,5 +22,5 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mgui -I../mgeom -I../mdata -I../mhist \
+INCLUDES = -I. -I../mbase -I../mgui -I../mgeom -I../mdata -I../mhbase \
 	   -I../mfileio -I../mfilter