diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:00:22 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 21:00:22 +0200 |
| commit | 8acf3d5894ca7bf3fda15e87433919e89118aa49 (patch) | |
| tree | 7071d4b4c574ae33a1c4dddd9a925c8704139783 /smileys.mdwn | |
| parent | 532f5277bc03f5709032a2c6f242a85a353c7f48 (diff) | |
| parent | 30dd469765c2396ded03355876af391e922e89b3 (diff) | |
Merge branch 'master' into master-da
Conflicts (manully merged):
smileys.mdwn
Diffstat (limited to 'smileys.mdwn')
| -rw-r--r-- | smileys.mdwn | 81 |
1 files changed, 41 insertions, 40 deletions
diff --git a/smileys.mdwn b/smileys.mdwn index 3af389b..ed3310c 100644 --- a/smileys.mdwn +++ b/smileys.mdwn @@ -1,47 +1,48 @@ Denne side bruges til at styre hvilke smileys denne wiki understøtter. Skriv blot smiley-teksten for at vise den. -* \:) [[smileys/smile.png]] -* \:-) [[smileys/smile.png]] -* \:D [[smileys/biggrin.png]] -* \:-D [[smileys/biggrin.png]] -* \B) [[smileys/smile2.png]] -* \B-) [[smileys/smile2.png]] -* \:)) [[smileys/smile3.png]] -* \:-)) [[smileys/smile3.png]] -* \;) [[smileys/smile4.png]] -* \;-) [[smileys/smile4.png]] -* \:\ [[smileys/ohwell.png]] -* \:-\ [[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]] -* \:( [[smileys/sad.png]] -* \:-( [[smileys/sad.png]] -* \:-? [[smileys/tongue.png]] -* \:-P [[smileys/tongue.png]] -* \:o [[smileys/redface.png]] -* \|) [[smileys/tired.png]] -* \|-) [[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/question.png]] -* \{*} [[smileys/star_on.png]] -* \{o} [[smileys/star_off.png]] -* \{1} [[smileys/prio1.png]] -* \{2} [[smileys/prio2.png]] -* \{3} [[smileys/prio3.png]] +* \\:) [[smileys/smile.png]] +* \\:-) [[smileys/smile.png]] +* \\:D [[smileys/biggrin.png]] +* \\:-D [[smileys/biggrin.png]] +* \\B) [[smileys/smile2.png]] +* \\B-) [[smileys/smile2.png]] +* \\:)) [[smileys/smile3.png]] +* \\:-)) [[smileys/smile3.png]] +* \\;) [[smileys/smile4.png]] +* \\;-) [[smileys/smile4.png]] +* \\:\ [[smileys/ohwell.png]] +* \\:-\ [[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]] +* \\:( [[smileys/sad.png]] +* \\:-( [[smileys/sad.png]] +* \\:-? [[smileys/tongue.png]] +* \\:-P [[smileys/tongue.png]] +* \\:o [[smileys/redface.png]] +* \\|) [[smileys/tired.png]] +* \\|-) [[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/question.png]] +* \\{x} [[smileys/star_on.png]] +* \\{*} [[smileys/star_on.png]] +* \\{o} [[smileys/star_off.png]] +* \\{1} [[smileys/prio1.png]] +* \\{2} [[smileys/prio2.png]] +* \\{3} [[smileys/prio3.png]] -Eksempel: {*} B) {*} +Eksempel: {x} B) {x} ---- |