Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 7228)
+++ trunk/MagicSoft/Mars/Changelog	(revision 7229)
@@ -21,4 +21,12 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2005/07/27 Markus Meyer, Daniela Dorner
+
+   * datacenter/fillstar.C:
+     - implemented new algorithm and new values for the calculation 
+       of the muon parameter in the database
+
+
+
  2005/07/28 Thomas Bretz
 
@@ -29,4 +37,5 @@
 
 
+>>>>>>> 1.2917
  2005/07/27 Markus Meyer, Thomas Bretz