From: joshtriplett Date: Fri, 6 Apr 2007 02:53:36 +0000 (+0000) Subject: * Add neutral smileys ":|" and ":-|", and question icon smiley "(?)", X-Git-Tag: 1.49~89 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/a4d5000f04ab7ff5eadd2f39897b5e4cfc5c8a1e * 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 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 Thu, 05 Apr 2007 17:36:14 -0700 + -- Joey Hess 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 000000000..ddeb59231 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 index 000000000..df22152e6 Binary files /dev/null and b/doc/smileys/question.png differ