diff options
| author | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-03-09 00:32:10 +0100 |
| commit | f4a1732b0e65ea4459098e4e852dff10a5af9320 (patch) | |
| tree | 60b8cf4b1677504cb86f301bb62a33cc769fafd9 /debian | |
| parent | cc5be82b8b7cfe3b679d8ba4f0d62e0894d9f964 (diff) | |
| parent | 0978be7affa6222d91a0bc71ddd1e86f81fc56cd (diff) | |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/copyright | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 801dc154f..c66db85a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -ikiwiki (3.07) UNRELEASED; urgency=low +ikiwiki (3.07) unstable; urgency=low * Updated German translation (Kai Wasserbäch). Closes: #518377 * Updated French translation (Jean-Luc Coulon). Closes: #518510 - - -- Joey Hess <joeyh@debian.org> Thu, 05 Mar 2009 15:43:02 -0500 + * wmd: New plugin contributed by William Uther to support the WMD + Wysiwym markdown editor. + * smiley: Avoid infinite loop in smiley expansion triggered + by the template scan mode change in version 3.05. Closes: #518805 + * template: When loading a template in scan mode, let preprocess + know it only needs to scan. + + -- Joey Hess <joeyh@debian.org> Sun, 08 Mar 2009 19:00:46 -0400 ikiwiki (3.06) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 0299d8a77..1e2a27349 100644 --- a/debian/copyright +++ b/debian/copyright @@ -126,6 +126,10 @@ Files: 404.pm Copyright: © 2009 Simon McVittie <http://smcv.pseudorandom.co.uk/> License: GPL-2+ +Files: wmd.pm +Copyright: © 2009 William Uther +License: GPL-2+ + Files: doc/logo/* Copyright: © 2006 Recai Oktaş <roktas@debian.org> License: GPL-2+ |