* Add neutral smileys ":|" and ":-|", and question icon smiley "(?)",

  with images taken from phpBB (GPL) and converted with gif2png.

diff --git a/debian/changelog b/debian/changelog
index b43cdfa0ecce6773276d167568c25df6da1b4d24..015060eb316950233e77893fa2961c0b9362aef6 100644 (file)
--- 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 fe952eebc57e31336dfa85a3e6363c4ccb8d35a6..9915ec587a9d5a431c67a38671917589e4394763 100644 (file)
--- 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 (file)
index 0000000..ddeb592
Binary files /dev/null and b/doc/smileys/neutral.png differ

diff --git a/doc/smileys/question.png b/doc/smileys/question.png
new file mode 100644 (file)
index 0000000..df22152
Binary files /dev/null and b/doc/smileys/question.png differ