diff options
| author | joshtriplett <joshtriplett@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-06 02:53:36 +0000 |
|---|---|---|
| committer | joshtriplett <joshtriplett@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-04-06 02:53:36 +0000 |
| commit | a4d5000f04ab7ff5eadd2f39897b5e4cfc5c8a1e (patch) | |
| tree | 60933dfab6d5c7b450919d9e93e4b9e809e00902 | |
| parent | 92433bae253a4fc398f91a9b724c2edbb58f9521 (diff) | |
| download | ikiwiki-a4d5000f04ab7ff5eadd2f39897b5e4cfc5c8a1e.tar ikiwiki-a4d5000f04ab7ff5eadd2f39897b5e4cfc5c8a1e.tar.gz | |
* Add neutral smileys ":|" and ":-|", and question icon smiley "(?)",
with images taken from phpBB (GPL) and converted with gif2png.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | doc/smileys.mdwn | 3 | ||||
| -rw-r--r-- | doc/smileys/neutral.png | bin | 0 -> 239 bytes | |||
| -rw-r--r-- | doc/smileys/question.png | bin | 0 -> 302 bytes |
4 files changed, 6 insertions, 1 deletions
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 Binary files differnew file mode 100644 index 000000000..ddeb59231 --- /dev/null +++ b/doc/smileys/neutral.png diff --git a/doc/smileys/question.png b/doc/smileys/question.png Binary files differnew file mode 100644 index 000000000..df22152e6 --- /dev/null +++ b/doc/smileys/question.png |
