comparison lisp/org/org-entities.el @ 112330:56d3e9c28eb0

Merge from mainline.
author Paul Eggert <eggert@cs.ucla.edu>
date Mon, 17 Jan 2011 11:01:01 -0800
parents ef719132ddfa
children
comparison
equal deleted inserted replaced
112329:e36b2f5d36cd 112330:56d3e9c28eb0
1 ;;; org-entities.el --- Support for special entities in Org-mode 1 ;;; org-entities.el --- Support for special entities in Org-mode
2 2
3 ;; Copyright (C) 2010 Free Software Foundation, Inc. 3 ;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
4 4
5 ;; Author: Carsten Dominik <carsten at orgmode dot org>, 5 ;; Author: Carsten Dominik <carsten at orgmode dot org>,
6 ;; Ulf Stegemann <ulf at zeitform dot de> 6 ;; Ulf Stegemann <ulf at zeitform dot de>
7 ;; Keywords: outlines, calendar, wp 7 ;; Keywords: outlines, calendar, wp
8 ;; Homepage: http://orgmode.org 8 ;; Homepage: http://orgmode.org
566 566
567 ;; Local variables: 567 ;; Local variables:
568 ;; coding: utf-8 568 ;; coding: utf-8
569 ;; End: 569 ;; End:
570 570
571 ;; arch-tag: e6bd163f-7419-4009-9c93-a74623016424
572 571
573 ;;; org-entities.el ends here 572 ;;; org-entities.el ends here