tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-10-08 08:08:11 +02:00
parent 379e2b1bea 0eb0e5778b
commit 2829fdad0b
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/lisp/org-registry.el
View File

@ -5,8 +5,8 @@
;; Emacs Lisp Archive Entry ;; Emacs Lisp Archive Entry
;; Filename: org-registry.el ;; Filename: org-registry.el
;; Version: 0.1a ;; Version: 0.1a
;; Author: Bastien Guerry <bzg AT gnu DOT org> ;; Author: Bastien Guerry <bzg@gnu.org>
;; Maintainer: Bastien Guerry <bzg AT gnu DOT org> ;; Maintainer: Bastien Guerry <bzg@gnu.org>
;; Keywords: org, wp, registry ;; Keywords: org, wp, registry
;; Description: Shows Org files where the current buffer is linked ;; Description: Shows Org files where the current buffer is linked
;; URL: http://www.cognition.ens.fr/~guerry/u/org-registry.el ;; URL: http://www.cognition.ens.fr/~guerry/u/org-registry.el

2
contrib/lisp/org-toc.el
View File

@ -2,7 +2,7 @@
;; Copyright 2007-2013 Free Software Foundation, Inc. ;; Copyright 2007-2013 Free Software Foundation, Inc.
;; ;;
;; Author: Bastien Guerry <bzg AT gnu DOT org> ;; Author: Bastien Guerry <bzg@gnu.org>
;; Keywords: Org table of contents ;; Keywords: Org table of contents
;; Homepage: http://www.cognition.ens.fr/~guerry/u/org-toc.el ;; Homepage: http://www.cognition.ens.fr/~guerry/u/org-toc.el
;; Version: 0.8 ;; Version: 0.8

2
contrib/lisp/org-track.el
View File

@ -3,7 +3,7 @@
;; Copyright (C) 2009-2013 ;; Copyright (C) 2009-2013
;; Free Software Foundation, Inc. ;; Free Software Foundation, Inc.
;; ;;
;; Author: Bastien Guerry <bzg at altern dot org> ;; Author: Bastien Guerry <bzg@gnu.org>
;; Eric S Fraga <e.fraga at ucl.ac dot uk> ;; Eric S Fraga <e.fraga at ucl.ac dot uk>
;; Sebastian Rose <sebastian_rose at gmx dot de> ;; Sebastian Rose <sebastian_rose at gmx dot de>
;; The Worg people http://orgmode.org/worg/ ;; The Worg people http://orgmode.org/worg/

2
contrib/lisp/ox-rss.el
View File

@ -2,7 +2,7 @@
;; Copyright (C) 2013 Bastien Guerry ;; Copyright (C) 2013 Bastien Guerry
;; Author: Bastien Guerry <bzg at gnu dot org> ;; Author: Bastien Guerry <bzg@gnu.org>
;; Keywords: org, wp, blog, feed, rss ;; Keywords: org, wp, blog, feed, rss
;; This file is not yet part of GNU Emacs. ;; This file is not yet part of GNU Emacs.

2
lisp/org-bibtex.el
View File

@ -2,7 +2,7 @@
;; ;;
;; Copyright (C) 2007-2013 Free Software Foundation, Inc. ;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
;; ;;
;; Authors: Bastien Guerry <bzg at gnu dot org> ;; Authors: Bastien Guerry <bzg@gnu.org>
;; Carsten Dominik <carsten dot dominik at gmail dot com> ;; Carsten Dominik <carsten dot dominik at gmail dot com>
;; Eric Schulte <schulte dot eric at gmail dot com> ;; Eric Schulte <schulte dot eric at gmail dot com>
;; Keywords: org, wp, capture ;; Keywords: org, wp, capture

2
lisp/org-list.el
View File

@ -3,7 +3,7 @@
;; Copyright (C) 2004-2013 Free Software Foundation, Inc. ;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
;; ;;
;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Bastien Guerry <bzg AT gnu DOT org> ;; Bastien Guerry <bzg@gnu.org>
;; Keywords: outlines, hypermedia, calendar, wp ;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org
;; ;;

2
lisp/org-protocol.el
View File

@ -2,7 +2,7 @@
;; ;;
;; Copyright (C) 2008-2013 Free Software Foundation, Inc. ;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
;; ;;
;; Authors: Bastien Guerry <bzg AT gnu DOT org> ;; Authors: Bastien Guerry <bzg@gnu.org>
;; Daniel M German <dmg AT uvic DOT org> ;; Daniel M German <dmg AT uvic DOT org>
;; Sebastian Rose <sebastian_rose AT gmx DOT de> ;; Sebastian Rose <sebastian_rose AT gmx DOT de>
;; Ross Patterson <me AT rpatterson DOT net> ;; Ross Patterson <me AT rpatterson DOT net>

2
lisp/org-src.el
View File

@ -3,7 +3,7 @@
;; Copyright (C) 2004-2013 Free Software Foundation, Inc. ;; Copyright (C) 2004-2013 Free Software Foundation, Inc.
;; ;;
;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Author: Carsten Dominik <carsten at orgmode dot org>
;; Bastien Guerry <bzg AT gnu DOT org> ;; Bastien Guerry <bzg@gnu.org>
;; Dan Davison <davison at stats dot ox dot ac dot uk> ;; Dan Davison <davison at stats dot ox dot ac dot uk>
;; Keywords: outlines, hypermedia, calendar, wp ;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org

2
mk/eldo.el
View File

@ -2,7 +2,7 @@
;; Copyright (C) 2012, 2013 Bastien Guerry ;; Copyright (C) 2012, 2013 Bastien Guerry
;; ;;
;; Author: Bastien Guerry <bzg at gnu dot org> ;; Author: Bastien Guerry <bzg@gnu.org>
;; Keywords: elisp, documentation, org ;; Keywords: elisp, documentation, org
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org
;; ;;