diff options
author | Bastien Guerry <bzg@altern.org> | 2012-05-25 09:42:02 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-05-25 09:42:02 +0200 |
commit | 747d71675c9cc7059c1ba7175cdd80a11d478a77 (patch) | |
tree | 8aefc9d57cc4b439ecb9b14051ef00a3755acf5f | |
parent | f12e41e37c563a6774f8e8f6ca407a882f96e9a3 (diff) | |
parent | 60587ea91cb42ae8618666c7dae5b029f751b913 (diff) | |
download | org-mode-747d71675c9cc7059c1ba7175cdd80a11d478a77.tar.gz |
Merge branch 'maint'
Conflicts:
doc/org.texi
doc/orgguide.texi
lisp/org.el
-rw-r--r-- | README_DIST | 2 | ||||
-rw-r--r-- | doc/orgcard.tex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/README_DIST b/README_DIST index b8baaa3..1c6d49d 100644 --- a/README_DIST +++ b/README_DIST @@ -1,7 +1,7 @@ The is a distribution of Org, a plain text notes and project planning tool for Emacs. -The version of this release is: 7.8.10 +The version of this release is: 7.8.11 The homepage of Org is at http://orgmode.org diff --git a/doc/orgcard.tex b/doc/orgcard.tex index 6bebbaa..3c0584d 100644 --- a/doc/orgcard.tex +++ b/doc/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{7.8.10} +\def\orgversionnumber{7.8.11} \def\versionyear{2012} % latest update \def\year{2012} % latest copyright year |