aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2007-11-29 01:42:04 +0000
committerRalph Amissah <ralph@amissah.com>2007-11-29 01:42:04 +0000
commit6403e72db5d935cf9c7b87a2ebe30d6fc3bb5046 (patch)
tree5a6ba00ae9798d6cbbf9b95f89d204b0dbf96061
parentchangelog fix, be more careful with git resets (diff)
parentchangelog and version updated (diff)
Merge branch 'upstream' into debian/sid
-rw-r--r--CHANGELOG8
-rw-r--r--conf/sisu/version.yml4
-rw-r--r--data/doc/sisu/CHANGELOG8
3 files changed, 10 insertions, 10 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 52a98c10..1ecb11ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,11 +9,11 @@ Reverse Chronological:
%% STABLE MANIFEST
-%% sisu_0.62.3.orig.tar.gz (2007-11-26:48/1)
+%% sisu_0.62.3.orig.tar.gz (2007-11-27:48/2)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3.orig.tar.gz
- sisu_0.62.3.orig.tar.gz
- sisu_0.62.3-1.dsc
- sisu_0.62.3-1.diff.gz
+ 46511173fc0e3d75982debc37206fa6e 1481806 sisu_0.62.3.orig.tar.gz
+ 494386aa1e44ebd9ea4d2c7bcfd41ba3 606 sisu_0.62.3-1.dsc
+ d7a5222e99c53c7bd561b1e322b8a490 145532 sisu_0.62.3-1.diff.gz
* html <hr> follows text, before footnotes (refine later)
diff --git a/conf/sisu/version.yml b/conf/sisu/version.yml
index 46714999..5dd490ba 100644
--- a/conf/sisu/version.yml
+++ b/conf/sisu/version.yml
@@ -1,5 +1,5 @@
---
-:date: "2007-11-27"
+:date: "2007-11-29"
:project: SiSU
:version: 0.62.3
-:date_stamp: 2007w48/2
+:date_stamp: 2007w48/4
diff --git a/data/doc/sisu/CHANGELOG b/data/doc/sisu/CHANGELOG
index 52a98c10..1ecb11ae 100644
--- a/data/doc/sisu/CHANGELOG
+++ b/data/doc/sisu/CHANGELOG
@@ -9,11 +9,11 @@ Reverse Chronological:
%% STABLE MANIFEST
-%% sisu_0.62.3.orig.tar.gz (2007-11-26:48/1)
+%% sisu_0.62.3.orig.tar.gz (2007-11-27:48/2)
http://www.jus.uio.no/sisu/pkg/src/sisu_0.62.3.orig.tar.gz
- sisu_0.62.3.orig.tar.gz
- sisu_0.62.3-1.dsc
- sisu_0.62.3-1.diff.gz
+ 46511173fc0e3d75982debc37206fa6e 1481806 sisu_0.62.3.orig.tar.gz
+ 494386aa1e44ebd9ea4d2c7bcfd41ba3 606 sisu_0.62.3-1.dsc
+ d7a5222e99c53c7bd561b1e322b8a490 145532 sisu_0.62.3-1.diff.gz
* html <hr> follows text, before footnotes (refine later)