ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hotfix-7.8.06'

This commit is contained in:
Bastien Guerry 2012-04-01 22:12:16 +02:00
parent 7973f8e2fb 68d8b10c9e
commit 5d4e5cbe41
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ob-fortran.el
View File

@ -2,7 +2,8 @@
;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte ;; Authors: Sergey Litvinov
;; Eric Schulte
;; Keywords: literate programming, reproducible research, fortran ;; Keywords: literate programming, reproducible research, fortran
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org

9
lisp/org-protocol.el
View File

@ -1,12 +1,11 @@
;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions. ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions.
;; ;;
;; Copyright (C) 2008-2012 ;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
;; Free Software Foundation, Inc.
;; ;;
;; Author: Bastien Guerry <bzg AT gnu DOT org> ;; Author: Bastien Guerry <bzg AT gnu DOT org>
;; Author: Daniel M German <dmg AT uvic DOT org> ;; Daniel M German <dmg AT uvic DOT org>
;; Author: Sebastian Rose <sebastian_rose AT gmx DOT de> ;; Sebastian Rose <sebastian_rose AT gmx DOT de>
;; Author: Ross Patterson <me AT rpatterson DOT net> ;; Ross Patterson <me AT rpatterson DOT net>
;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de> ;; Maintainer: Sebastian Rose <sebastian_rose AT gmx DOT de>
;; Keywords: org, emacsclient, wp ;; Keywords: org, emacsclient, wp