Merge from lcourtes@laas.fr--2004-libre

Patches applied:

 * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2  (patch 60-62)

   - Slightly optimized the resolution process (added `ast-resolved?').
   - Various fixes in the documentation code.
   - Lout engine: use `push-default-engine' and `pop-default-engine'.

git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-38

1 files changed, 26 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 2ba8d09..98f9b8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,32 @@
 # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
 #
 
+2006-03-07 21:25:37 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-38
+
+    Summary:
+      Merge from lcourtes@laas.fr--2004-libre
+    Revision:
+      skribilo--devel--1.2--patch-38
+
+    Patches applied:
+    
+     * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2  (patch 60-62)
+    
+       - Slightly optimized the resolution process (added `ast-resolved?').
+       - Various fixes in the documentation code.
+       - Lout engine: use `push-default-engine' and `pop-default-engine'.
+
+    modified files:
+     ChangeLog doc/skr/manual.skr doc/user/document.skb
+     doc/user/src/api2.skb doc/user/src/bib1.sbib doc/user/user.skb
+     src/guile/skribilo/engine/lout.scm
+
+    new patches:
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-60
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-61
+     lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-62
+
+
 2006-02-28 21:40:26 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-37
 
     Summary: