Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6476)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6477)
@@ -21,4 +21,16 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2005/02/15 Thomas Bretz
+
+   * callisto.rc:
+     - replaced mutal exclusive options (Integral, Amplitude) by
+       a one-line resource
+
+   * msignal/MExtractTimeAndChargeSpline.cc:
+     - replaced mutal exclusive options (Integral, Amplitude) by
+       a one-line resource "ExtractionType" (old code still works)
+
+
 
  2005/02/15 Markus Gaug