diff --git a/ChangeLog b/ChangeLog
index 608b18c064abb6b5e7f9bf24c3427e5eebcb80a2..64f94c2381856e1a416540ad0a0a66e4699225e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,109 @@
+2004-03-24  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/admin/configure.ac:
+	Set version to 1.3-alpha to reflect Dani's merge of the BM-branch.
+
+2004-03-24  Daniel Koester  <dani@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/macro_common.c:
+	write_macro now calculates and writes neighborhood relationships. (Suggested by Oli)
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/macro_common.c:
+	write_macro now also computes and writes neighborhood relationships. (Suggested by Oli)
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/1d/element.c:
+	added "sort_face_indices()"
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/gltools.c, /net/sauron/graid/ALBERT_CVS/DEMO/src/1d/Makefile.in, /net/sauron/graid/ALBERT_CVS/DEMO/src/2d/Makefile.in, /net/sauron/graid/ALBERT_CVS/DEMO/src/3d/Makefile.in, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/Makefile.alberta.in:
+	Changed a few targets and fixed a buglet in gltools.c.
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/Makefile.alberta.in, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/gltools.c, /net/sauron/graid/ALBERT_CVS/DEMO/src/1d/Makefile.in, /net/sauron/graid/ALBERT_CVS/DEMO/src/2d/Makefile.in, /net/sauron/graid/ALBERT_CVS/DEMO/src/3d/Makefile.in:
+	Changed some targets and fixed a buglet in gltools.c
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/alberta_dow_inlines.h:
+	Had to re-add this file (still not sure what went wrong before).
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/assemble_dowb.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/estimator_dowb.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/oem_solve_dowb.c:
+	Had to re-add these files (still not sure what went wrong before).
+
+2004-03-24  Kunibert G. Siebert  <siebert@math.uni-augsburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/1d/element.c:
+	inserted sort_face_indices for 1d
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/gltools.c:
+	The Lagrange grid is now memorized for each DOF_REAL(_D)_VEC and used
+	again on the next call.
+
+2004-03-24  Daniel Koester  <dani@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/3d/Makefile.am, /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/2d/Makefile.am, /net/sauron/graid/ALBERT_CVS/DEMO/src/Common/graphics.c, /net/sauron/graid/ALBERT_CVS/DEMO/src/2d/.cvsignore, /net/sauron/graid/ALBERT_CVS/DEMO/src/2d/Makefile.in, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/Makefile.am.include, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/alberta.h, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/assemble.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/dof_admin.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/eval.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/memory.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/oem_solve_s.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/sor.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/ssor.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/3d/element.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/2d/Makefile.am.include, /net/sauron/graid/ALBERT_CVS/ALBERTA/NEWS, /net/sauron/graid/ALBERT_CVS/admin/ChangeLog, /net/sauron/graid/ALBERT_CVS/admin/.cvsignore:
+	Incorporated DOF_DOWB_MATRIX codes.
+	New release branch for ALBERTA 1.2 without block matrices was created before this step.
+
+2004-03-24  Daniel Koester  <dani@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/macro_common.c:
+	write_macro now calculates and writes neighborhood relationships. (Suggested by Oli)
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/macro_common.c:
+	write_macro now also computes and writes neighborhood relationships. (Suggested by Oli)
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/1d/element.c:
+	added "sort_face_indices()"
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/gltools.c, /net/sauron/graid/ALBERT_CVS/DEMO/src/1d/Makefile.in, /net/sauron/graid/ALBERT_CVS/DEMO/src/2d/Makefile.in, /net/sauron/graid/ALBERT_CVS/DEMO/src/3d/Makefile.in, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/Makefile.alberta.in:
+	Changed a few targets and fixed a buglet in gltools.c.
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/Makefile.alberta.in, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/gltools.c, /net/sauron/graid/ALBERT_CVS/DEMO/src/1d/Makefile.in, /net/sauron/graid/ALBERT_CVS/DEMO/src/2d/Makefile.in, /net/sauron/graid/ALBERT_CVS/DEMO/src/3d/Makefile.in:
+	Changed some targets and fixed a buglet in gltools.c
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/alberta_dow_inlines.h:
+	Had to re-add this file (still not sure what went wrong before).
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/assemble_dowb.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/estimator_dowb.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/oem_solve_dowb.c:
+	Had to re-add these files (still not sure what went wrong before).
+
+2004-03-24  Kunibert G. Siebert  <siebert@math.uni-augsburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/1d/element.c:
+	inserted sort_face_indices for 1d
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/gltools.c:
+	The Lagrange grid is now memorized for each DOF_REAL(_D)_VEC and used
+	again on the next call.
+
+2004-03-24  Daniel Koester  <dani@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/3d/Makefile.am, /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/2d/Makefile.am, /net/sauron/graid/ALBERT_CVS/DEMO/src/Common/graphics.c, /net/sauron/graid/ALBERT_CVS/DEMO/src/2d/.cvsignore, /net/sauron/graid/ALBERT_CVS/DEMO/src/2d/Makefile.in, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/Makefile.am.include, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/alberta.h, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/assemble.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/dof_admin.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/eval.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/memory.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/oem_solve_s.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/sor.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/ssor.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/3d/element.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/2d/Makefile.am.include, /net/sauron/graid/ALBERT_CVS/ALBERTA/NEWS, /net/sauron/graid/ALBERT_CVS/admin/ChangeLog, /net/sauron/graid/ALBERT_CVS/admin/.cvsignore:
+	Incorporated DOF_DOWB_MATRIX codes.
+	New release branch for ALBERTA 1.2 without block matrices was created before this step.
+
+2004-03-19  Alfred Schmidt  <alfred@gloin>
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/HB_precon.c:
+	removed exit_HB_precon when level < 2
+
+2004-03-18  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/admin/configure.ac:
+	Forgot to bump version to ...-pre8
+
+2004-03-17  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/3d/traverse_r.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/alberta.h, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/alberta_dow_inlines.h, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/estimator.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/macro_common.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/memory.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/oem_solve_d.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/trav_xy.c, /net/sauron/graid/ALBERT_CVS/DEMO/src/Common/ellipt_dowb_problem.c, /net/sauron/graid/ALBERT_CVS/GRAPE/mesh/Common/mesh_interface_common.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/NEWS, /net/sauron/graid/ALBERT_CVS/ALBERTA/doc/alberta.tex, /net/sauron/graid/ALBERT_CVS/ALBERTA/doc/defs.tex, /net/sauron/graid/ALBERT_CVS/ALBERTA/doc/eval-impl.tex, /net/sauron/graid/ALBERT_CVS/ALBERTA/doc/heat.tex, /net/sauron/graid/ALBERT_CVS/ALBERTA/doc/preface.tex, /net/sauron/graid/ALBERT_CVS/ALBERTA/doc/struct-func.tex, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/1d/element.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/1d/graphXO.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/2d/element.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/2d/graphXO.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/2d/macro.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/3d/element.c, /net/sauron/graid/ALBERT_CVS/ALBERTA/src/3d/macro.c, /net/sauron/graid/ALBERT_CVS/admin/MAINTENANCE:
+	Merge from 1.2-pre8.
+
+	* /net/sauron/graid/ALBERT_CVS/admin/configure.ac:
+	Bump version to 1.2-pre8.
+
+	* /net/sauron/graid/ALBERT_CVS/admin/ChangeLog: Update.
+
+2004-03-04  Kunibert G. Siebert  <siebert@math.uni-augsburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/alberta.h:
+	changed bug in definition of SCAL_DOW
+
 2004-03-04  Kunibert G. Siebert  <siebert@math.uni-augsburg.de>
 
 	* /net/sauron/graid/ALBERT_CVS/ALBERTA/src/Common/alberta.h: