summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorLudovic Courtes2006-03-07 21:29:32 +0000
committerLudovic Courtes2006-03-07 21:29:32 +0000
commita1fe0c70cf816c122d3ba640bc9abf553f076d5d (patch)
tree40c60a3c1b2ca71206a151fb173412992e22c843 /ChangeLog
parent7ddcfdf4f07723986ec519fb8b9eb965bd24ea1d (diff)
parent950293910c75c4ecd7d3ff072c428150d55d7f78 (diff)
downloadskribilo-a1fe0c70cf816c122d3ba640bc9abf553f076d5d.tar.gz
skribilo-a1fe0c70cf816c122d3ba640bc9abf553f076d5d.tar.lz
skribilo-a1fe0c70cf816c122d3ba640bc9abf553f076d5d.zip
Merge from lcourtes@laas.fr--2004-libre
Patches applied: * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2 (patch 67-69) - Doc: undoed `patch-65'. - Removed the global engine table. - Inventory fix. git-archimport-id: lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2--patch-42
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog25
1 files changed, 25 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 857cfb9..97098d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,31 @@
# arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
#
+2006-03-07 21:29:32 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-42
+
+ Summary:
+ Merge from lcourtes@laas.fr--2004-libre
+ Revision:
+ skribilo--devel--1.2--patch-42
+
+ Patches applied:
+
+ * lcourtes@laas.fr--2004-libre/skribilo--devel--1.2 (patch 67-69)
+
+ - Doc: undoed `patch-65'.
+ - Removed the global engine table.
+ - Inventory fix.
+
+ modified files:
+ ChangeLog doc/user/.arch-inventory doc/user/markup.skb
+ src/guile/skribilo/engine.scm
+
+ new patches:
+ lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-67
+ lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-68
+ lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-69
+
+
2006-03-07 21:28:47 GMT Ludovic Courtes <ludovic.courtes@laas.fr> patch-41
Summary: