From a4d5000f04ab7ff5eadd2f39897b5e4cfc5c8a1e Mon Sep 17 00:00:00 2001
From: joshtriplett <joshtriplett@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 6 Apr 2007 02:53:36 +0000
Subject: [PATCH] * Add neutral smileys ":|" and ":-|", and question icon
 smiley "(?)",   with images taken from phpBB (GPL) and converted with
 gif2png.

---
 debian/changelog         |   4 +++-
 doc/smileys.mdwn         |   3 +++
 doc/smileys/neutral.png  | Bin 0 -> 239 bytes
 doc/smileys/question.png | Bin 0 -> 302 bytes
 4 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 doc/smileys/neutral.png
 create mode 100644 doc/smileys/question.png

diff --git a/debian/changelog b/debian/changelog
index b43cdfa0e..015060eb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ ikiwiki (1.49) UNRELEASED; urgency=low
 
   [ Josh Triplett ]
   * Use pngcrush and optipng on all PNG files.
+  * Add neutral smileys ":|" and ":-|", and question icon smiley "(?)",
+    with images taken from phpBB (GPL) and converted with gif2png.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 05 Apr 2007 17:36:14 -0700
+ -- Joey Hess <joeyh@debian.org>  Thu, 05 Apr 2007 19:52:01 -0700
 
 ikiwiki (1.48) unstable; urgency=low
 
diff --git a/doc/smileys.mdwn b/doc/smileys.mdwn
index fe952eebc..9915ec587 100644
--- a/doc/smileys.mdwn
+++ b/doc/smileys.mdwn
@@ -15,6 +15,8 @@ Just write the text of a smiley to display it.
 * \:-\	[[smileys/ohwell.png]]
 * \:/	[[smileys/ohwell.png]]
 * \:-/	[[smileys/ohwell.png]]
+* \:|	[[smileys/neutral.png]]
+* \:-|	[[smileys/neutral.png]]
 * \>:>	[[smileys/devil.png]]
 * \X-(	[[smileys/angry.png]]
 * \<:(	[[smileys/frown.png]]
@@ -32,6 +34,7 @@ Just write the text of a smiley to display it.
 * \(!)	[[smileys/idea.png]]
 * \[!]	[[smileys/attention.png]]
 * \/!\	[[smileys/alert.png]]
+* \(?)	[[smileys/question.png]]
 * \{*}	[[smileys/star_on.png]]
 * \{o}	[[smileys/star_off.png]]
 * \{1}  [[smileys/prio1.png]]
diff --git a/doc/smileys/neutral.png b/doc/smileys/neutral.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddeb59231fdcc42349cfa4efc690abd9a4d8978d
GIT binary patch
literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K23?xtf=%@rz>H$6>u0Yz=6-53&$MF9o!@s!<
z|F<yw|2O&nU*Z4%kN<zl@c;ko|F0NoMAlyfDq<`N@(X5gcy=QV#7XjYcVSB7u1NuM
zGCf@!LpZJ{CnO|@h@>zuy1jgPG-2A8o_WU0m>e2kTBY-8vNK7#rZ*gz(CE17`GuLz
z=`pMlM-K9sD=@1tCwUx@IHd4PB!G8u@1#kSxB|o%f1G8!d`{yt1CH4{b~N~;C5U)?
ex8CB~Cd<&wta@=xz)mfor3{{~elF{r5}E++XI1S0

literal 0
HcmV?d00001

diff --git a/doc/smileys/question.png b/doc/smileys/question.png
new file mode 100644
index 0000000000000000000000000000000000000000..df22152e637c79cac1712bb3df68482a86085e07
GIT binary patch
literal 302
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K13?z9tQY(N|V1Q4EE0F&GisAn`hW{rS{>^3h
zzlGudU*Z4%CcnSUP+tm^WVnBp;s5{R=l3!2^D*pS&+z{#gT6My{7FE;*YYw9@!<^j
zH!!^4!?1rkLw*{AtE=m)?jB2^HpY@5zhDN3XE)M7oFs2|7p{y8U&4T#I!_nJ5RU7i
z{hnfn4LF>2=T!8xFME09FMrgA*RES1d4FI?4q0R5edhb&>Zra6#S9tJZ1VS>elBdA
zfAC&w)luzKf$TQ|OZmPsYx4>zi!4~ev0K|Y^p&npS+l76<Row27gqMYLYt46d=o6a
td0|&9yWq{|zqbawzwdhczWeL_`rGW-cW!aIxEJUW22WQ%mvv4FO#nBOcM<>q

literal 0
HcmV?d00001

-- 
2.39.2