Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 30 Aug 2016 09:52:23 +0000 (11:52 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 30 Aug 2016 09:52:23 +0000 (11:52 +0200)
1  2 
lisp/org-entities.el

@@@ -260,9 -265,8 +260,9 @@@ packages to be loaded, add these packag
  
       "* Other"
       "** Misc. (often used)"
-      ("circ" "\\^{}" nil "&circ;" "^" "^" "ˆ")
+      ("circ" "\\^{}" nil "&circ;" "^" "^" "∘")
       ("vert" "\\vert{}" t "&vert;" "|" "|" "|")
 +     ("vbar" "|" nil "|" "|" "|" "|")
       ("brvbar" "\\textbrokenbar{}" nil "&brvbar;" "|" "¦" "¦")
       ("S" "\\S" nil "&sect;" "paragraph" "§" "§")
       ("sect" "\\S" nil "&sect;" "paragraph" "§" "§")