diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-07-15 12:11:57 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-07-15 12:11:57 -0400 |
| commit | 9da30da6a7785927afed938c44f48557b10e0d7a (patch) | |
| tree | 812a595da15310ea16b302346255ea9e7194eb3e /CHANGELOG | |
| parent | debian/changelog (diff) | |
| parent | "Little Brother" change image used; "CONTENT" remove image, use text (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 17 |
1 files changed, 14 insertions, 3 deletions
@@ -6,11 +6,22 @@ Reverse Chronological: %% STABLE MANIFEST +%% sisu-markup-samples_2.0.5.orig.tar.gz (2010-07-15:28/4) +http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.5.orig.tar.gz + sisu-markup-samples_2.0.5.orig.tar.gz + sisu-markup-samples_2.0.5-1.dsc + sisu-markup-samples_2.0.5-1.diff.gz + + * Little Brother, use image by Richard Wilkinson (image 4 cropped), + (replacing previous image used based on original book cover) + + * CONTENT, remove image based on original book cover + %% sisu-markup-samples_2.0.4.orig.tar.gz (2010-06-27:25/7) http://www.jus.uio.no/sisu/archive/pool/non-free/s/sisu-markup-samples/sisu-markup-samples_2.0.4.orig.tar.gz - sisu-markup-samples_2.0.4.orig.tar.gz - sisu-markup-samples_2.0.4-1.dsc - sisu-markup-samples_2.0.4-1.diff.gz + ca6001d7373ad324356d08c8d043f444363bd9a7fe5f71e9f74586c31cded21e 14056624 sisu-markup-samples_2.0.4.orig.tar.gz + c53958da961153775ecd4f4fbed658418d413187501520679ecda67e97994c2a 1241 sisu-markup-samples_2.0.4-1.dsc + c4af4bdc43c0694bebebf577f8c12724c15960a698113af50a0866a4afb56b04 5256 sisu-markup-samples_2.0.4-1.diff.gz * adds text Democratizing Innovation, Eric von Hippel |