From 3ab2c837b302b01fff610f7b83050ab7e703477c Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 28 Jul 2011 17:13:49 +0200 Subject: Merge changes from Org 7.4 to current Org 7.7. --- lisp/org/org-mac-message.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lisp/org/org-mac-message.el') diff --git a/lisp/org/org-mac-message.el b/lisp/org/org-mac-message.el index 101743727c8..9c1089994ba 100644 --- a/lisp/org/org-mac-message.el +++ b/lisp/org/org-mac-message.el @@ -1,11 +1,11 @@ ;;; org-mac-message.el --- Links to Apple Mail.app messages from within Org-mode -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Christopher Suckling -;; Version: 7.4 +;; Version: 7.7 ;; Keywords: outlines, hypermedia, calendar, wp ;; This file is part of GNU Emacs. @@ -214,5 +214,6 @@ list of message:// links to flagged mail after heading." (provide 'org-mac-message) +;; arch-tag: 3806d0c1-abe1-4db6-9c31-f3ed7d4a9b32 ;;; org-mac-message.el ends here -- cgit v1.2.1