From d8c3baf7a3c152f44bcb0e68ed13776a38c8f3a0 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Thu, 18 Jan 2007 14:46:51 +0000
Subject: [PATCH] * Added smileys for Moin Moin compatability.

---
 basewiki/smileys.mdwn      |   4 ++++
 basewiki/smileys/prio1.png | Bin 0 -> 153 bytes
 basewiki/smileys/prio2.png | Bin 0 -> 159 bytes
 basewiki/smileys/prio3.png | Bin 0 -> 154 bytes
 debian/changelog           |   3 ++-
 5 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 basewiki/smileys/prio1.png
 create mode 100644 basewiki/smileys/prio2.png
 create mode 100644 basewiki/smileys/prio3.png

diff --git a/basewiki/smileys.mdwn b/basewiki/smileys.mdwn
index 73826c457..e5377ced2 100644
--- 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]]
+* \{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]]
+* \{1} [[smileys/prio1.png]]
+* \{2} [[smileys/prio2.png]]
+* \{3} [[smileys/prio3.png]]
 
 For example: {*} B) {*}
 
diff --git a/basewiki/smileys/prio1.png b/basewiki/smileys/prio1.png
new file mode 100644
index 0000000000000000000000000000000000000000..774d34d65285f2e977458a4e0a0a3a1691e74692
GIT binary patch
literal 153
zcmeAS@N?(olHy`uVBq!ia0vp^{2(?HGmzvixN`|e@dWsUxc&zLhW|5xe1`Q=&wPOt
zQ%R6t@PCG<+YP*cJjNt%cNb<s9-mJ@j;^PRV@SoV<P|_o+{`mpL~rHtFlp#ub$E2Y
rDYRaqPB&sJ`yr-oM~(?rJIoju&Zw`94O;9C)X3oJ>gTe~DWM4f+O98<

literal 0
HcmV?d00001

diff --git a/basewiki/smileys/prio2.png b/basewiki/smileys/prio2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c6fac54f19173b195ba19a510446feb91fb3c32
GIT binary patch
literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^{2(?HGmzvixN`|e@dWsUxc&zL24mwhK!Ni$@3?^!
zQ%R6t@PCG<+YP*cJjNt%cNb<s9-mJ@j<KhUV@SoV<P|_o+{`mpL~rHtFezw^aCmfI
xYn?sMeyJVb4E|(CeQjU3j#F_r*D7Wg28J$O6~%VZqp?8k44$rjF6*2UngAl{GQI!+

literal 0
HcmV?d00001

diff --git a/basewiki/smileys/prio3.png b/basewiki/smileys/prio3.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d03e62ce24d6b2124db32ea91d36e05d8aabdd2
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^{2(?HGmzvixN`|e@dWsUxc&zL28NkwK!MQ9Pvd|T
zQ%R6t@PCG<+YP*cJjNt%cNb<s9-mJ@j-IEBV@SoV<P|_o+{`mpL~rHtFezw^aCmfI
sYn?sMeyJVb93m17SG>_$!6(4TP~56)xHFb%4Nxb8r>mdKI;Vst0QqGw6#xJL

literal 0
HcmV?d00001

diff --git a/debian/changelog b/debian/changelog
index 7a6500643..24a36edcf 100644
--- 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.
+  * 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