Merge commit 'upstream/master'

[git.ikiwiki.info.git] / doc / todo / color_plugin.mdwn

diff --git a/doc/todo/color_plugin.mdwn b/doc/todo/color_plugin.mdwn
index 64ff46253eae1f8a64f8347e0d5002b844563139..69afe837d1f66ef8b5721c9357fc44487dd316b3 100644 (file)
--- a/doc/todo/color_plugin.mdwn
+++ b/doc/todo/color_plugin.mdwn
@@ -114,6 +114,12 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
 >>>> ready for integration (made a few minor changes). Is this GPL 2?
 >>>> --[[Joey]]
 
 >>>> ready for integration (made a few minor changes). Is this GPL 2?
 >>>> --[[Joey]]
 

+>>>>> No problem. I guessed it, because I've not seen your commits
+>>>>> at [[RecentChanges]] page in last days and I subscribe your
+>>>>> [blog](http://kitenet.net/~joey/blog/entry/vacation/) :D
+>>>>> It's GPL-2+ like your Ikiwiki and the most external plugins.
+>>>>> --[[Paweł|ptecza]]
+

        --- /dev/null   2008-06-21 02:02:15.000000000 +0200
        +++ color.pm    2008-07-27 14:58:12.000000000 +0200
        @@ -0,0 +1,69 @@
        --- /dev/null   2008-06-21 02:02:15.000000000 +0200
        +++ color.pm    2008-07-27 14:58:12.000000000 +0200
        @@ -0,0 +1,69 @@


@@ -221,3 +227,5 @@ Of course, I'm open for discussion or exchange of ideas :) --[[Paweł|ptecza]]
        +span.color {
        +       padding: 2px;
        +}
        +span.color {
        +       padding: 2px;
        +}

+
+[[done]]