diff options
| author | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-03-16 11:19:28 -0400 |
|---|---|---|
| committer | Amitai Schlair <schmonz-web-ikiwiki@schmonz.com> | 2012-03-16 11:19:28 -0400 |
| commit | 3a560b2719ec0ba22f9cc2adf0717d4efd56bb94 (patch) | |
| tree | de3b9dbe7d2b672760fcfba3c25355a764bf8afc /debian/control | |
| parent | 98b1359e06026cb8e9b475b0063fee3a06e5d3f9 (diff) | |
| parent | 9a9cdc6b25fee70769753dd6624698e46fd3f251 (diff) | |
| download | ikiwiki-3a560b2719ec0ba22f9cc2adf0717d4efd56bb94.tar ikiwiki-3a560b2719ec0ba22f9cc2adf0717d4efd56bb94.tar.gz | |
Merge branch 'master' into cvs
Diffstat (limited to 'debian/control')
| -rw-r--r-- | debian/control | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/control b/debian/control index 9403dfb44..54cbd0f7b 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, libsparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, po4a (>= 0.35-1), gettext, libnet-inet6glue-perl, - libtext-multimarkdown-perl + libtext-multimarkdown-perl, libxml-writer-perl Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table |