* Added smileys for Moin Moin compatability.

diff --git a/basewiki/smileys.mdwn b/basewiki/smileys.mdwn
index 73826c457740bd251d2cb62b88e8c3646a2e3552..e5377ced2b0f36af99d7e6c30b8fc017d58be08b 100644 (file)
--- a/basewiki/smileys.mdwn
+++ b/basewiki/smileys.mdwn
@@ -25,12 +25,16 @@ Just write the text of a smiley to display it.
 * \|-) [[smileys/tired.png]]
 * \{OK}        [[smileys/thumbs-up.png]]
 * \{X} [[smileys/icon-error.png]]
 * \|-) [[smileys/tired.png]]
 * \{OK}        [[smileys/thumbs-up.png]]
 * \{X} [[smileys/icon-error.png]]

+* \{i} [[smileys/icon-info.png]]

 * \(./)        [[smileys/checkmark.png]]
 * \(!) [[smileys/idea.png]]
 * \[!] [[smileys/attention.png]]
 * \/!\ [[smileys/alert.png]]
 * \{*} [[smileys/star_on.png]]
 * \{o} [[smileys/star_off.png]]
 * \(./)        [[smileys/checkmark.png]]
 * \(!) [[smileys/idea.png]]
 * \[!] [[smileys/attention.png]]
 * \/!\ [[smileys/alert.png]]
 * \{*} [[smileys/star_on.png]]
 * \{o} [[smileys/star_off.png]]

+* \{1} [[smileys/prio1.png]]
+* \{2} [[smileys/prio2.png]]
+* \{3} [[smileys/prio3.png]]

 
 For example: {*} B) {*}
 
 
 For example: {*} B) {*}
 

diff --git a/basewiki/smileys/prio1.png b/basewiki/smileys/prio1.png
new file mode 100644 (file)
index 0000000..774d34d
Binary files /dev/null and b/basewiki/smileys/prio1.png differ

diff --git a/basewiki/smileys/prio2.png b/basewiki/smileys/prio2.png
new file mode 100644 (file)
index 0000000..3c6fac5
Binary files /dev/null and b/basewiki/smileys/prio2.png differ

diff --git a/basewiki/smileys/prio3.png b/basewiki/smileys/prio3.png
new file mode 100644 (file)
index 0000000..2d03e62
Binary files /dev/null and b/basewiki/smileys/prio3.png differ

diff --git a/debian/changelog b/debian/changelog
index 7a6500643af0d933d64340979d90f35404b83ffc..24a36edcf7965c1a1d76869e389b9ae86acbad62 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ ikiwiki (1.41) UNRELEASED; urgency=low
   * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs,
     if an older version is installed, just don't gettext strings, instead of
     crashing.
   * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs,
     if an older version is installed, just don't gettext strings, instead of
     crashing.

+  * Added smileys for Moin Moin compatability.

 
 

- -- Joey Hess <joeyh@debian.org>  Mon, 15 Jan 2007 22:19:02 -0500
+ -- Joey Hess <joeyh@debian.org>  Thu, 18 Jan 2007 09:45:47 -0500

 
 ikiwiki (1.40) unstable; urgency=low
 
 
 ikiwiki (1.40) unstable; urgency=low