0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 10:10:42 +00:00

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2011-12-12 18:38:35 +01:00
commit d910b8ae87
6 changed files with 9 additions and 9 deletions

View file

@ -1,7 +1,7 @@
The is a distribution of Org, a plain text notes and project planning The is a distribution of Org, a plain text notes and project planning
tool for Emacs. tool for Emacs.
The version of this release is: 7.7 The version of this release is: 7.8
The homepage of Org is at http://orgmode.org The homepage of Org is at http://orgmode.org

View file

@ -4,8 +4,8 @@
@setfilename ../../info/org @setfilename ../../info/org
@settitle The Org Manual @settitle The Org Manual
@set VERSION 7.7 @set VERSION 7.8
@set DATE July 2011 @set DATE December 2011
@c Use proper quote and backtick for code sections in PDF output @c Use proper quote and backtick for code sections in PDF output
@c Cf. Texinfo manual 14.2 @c Cf. Texinfo manual 14.2

View file

@ -1,5 +1,5 @@
% Reference Card for Org Mode % Reference Card for Org Mode
\def\orgversionnumber{7.7} \def\orgversionnumber{7.8}
\def\versionyear{2011} % latest update \def\versionyear{2011} % latest update
\def\year{2011} % latest copyright year \def\year{2011} % latest copyright year

View file

@ -3,8 +3,8 @@
@setfilename ../../info/orgguide @setfilename ../../info/orgguide
@settitle The compact Org-mode Guide @settitle The compact Org-mode Guide
@set VERSION 7.7 @set VERSION 7.8
@set DATE July 2011 @set DATE December 2011
@c Use proper quote and backtick for code sections in PDF output @c Use proper quote and backtick for code sections in PDF output
@c Cf. Texinfo manual 14.2 @c Cf. Texinfo manual 14.2

View file

@ -5,7 +5,7 @@
;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte ;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte
;; Keywords: literate programming, reproducible research, fortran ;; Keywords: literate programming, reproducible research, fortran
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org
;; Version: 7.6 ;; Version: 7.8
;; This program is free software; you can redistribute it and/or modify ;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by ;; it under the terms of the GNU General Public License as published by

View file

@ -6,7 +6,7 @@
;; Maintainer: Bastien Guerry <bzg at gnu dot org> ;; Maintainer: Bastien Guerry <bzg at gnu dot org>
;; Keywords: outlines, hypermedia, calendar, wp ;; Keywords: outlines, hypermedia, calendar, wp
;; Homepage: http://orgmode.org ;; Homepage: http://orgmode.org
;; Version: 7.7 ;; Version: 7.8
;; ;;
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
;; ;;
@ -203,7 +203,7 @@ identifier."
;;; Version ;;; Version
(defconst org-version "7.7" (defconst org-version "7.8"
"The version number of the file org.el.") "The version number of the file org.el.")
(defun org-version (&optional here) (defun org-version (&optional here)