aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-02-08 22:05:40 -0500
committerRalph Amissah <ralph@amissah.com>2010-02-08 22:05:40 -0500
commit560ddedc8e44a9c79d0e42eff78b9de152015119 (patch)
treea66410bb480919688e18537fca680d81150d1ac7
parentdebian/changelog, update (diff)
parentchangelog, detail (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG3
-rw-r--r--data/doc/sisu/v1/CHANGELOG3
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 90a904f1..1328ce38 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,7 +19,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
* odf:odt odt.zip fix addressing issue with presentation of headings in
produced open document text
- *
+ * markup samples directory structure, minor adjustments, (and no longer
+ shared by package sisu_markup_samples, about which, see that package)
%% 1.0.0.orig.tar.gz (2009-12-19:50/6)
http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
diff --git a/data/doc/sisu/v1/CHANGELOG b/data/doc/sisu/v1/CHANGELOG
index 32811cb1..1328ce38 100644
--- a/data/doc/sisu/v1/CHANGELOG
+++ b/data/doc/sisu/v1/CHANGELOG
@@ -19,6 +19,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.1.orig.tar.gz
* odf:odt odt.zip fix addressing issue with presentation of headings in
produced open document text
+ * markup samples directory structure, minor adjustments, (and no longer
+ shared by package sisu_markup_samples, about which, see that package)
+
%% 1.0.0.orig.tar.gz (2009-12-19:50/6)
http://www.jus.uio.no/sisu/pkg/src/sisu_1.0.0.orig.tar.gz
7bec7f47f6ad5b816226af0489bc2ae81d4c9092b8870ba939e9f58800245dfd 1554276 sisu_1.0.0.orig.tar.gz