merge

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@937 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/ChangeLog b/ChangeLog
index 776f05e..6593e27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,17 @@
 2005-02-08 Martin
-  - Doxygenification of all GRAS. gtk-doc-tools is dead in SG now.
+  - Doxygenification of all GRAS. gtk-doc-tools is dead in SimGrid now.
   - Automatically extract all existing logging categories, and add the list
     to the documentation (long standing one, to say the less)
   - Cleanup the known architecture table. Reorder the entries to group what
     should be, and use a more consistant naming scheme.
     (some of the test dataset are still to be regenerated)
 
+2005-02-07 Arnaud
+  - Bug fix in the lmm_solver.
+  - Interface to Paje (see http://www-id.imag.fr/Logiciels/paje/) through
+    the function MSG_paje_output.
+  - Introducing two new functions MSG_process_kill() and MSG_process_killall().
+
 2005-02-04 Martin
   - Reenable GRAS/RL; keep GRAS/SG disabled for now
   - Various cleanups to the autotools stuff