summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus <rasmus@gmx.us>2015-08-21 22:26:11 +0200
committerRasmus <rasmus@gmx.us>2015-08-21 22:26:11 +0200
commitdbf2c95774dea28b04f421e907ba1c81590adda0 (patch)
tree23f0438327cda2464c91e79e572bdea129f725b4
parenta53620d8412227ea519079e56c264efb335ce118 (diff)
downloadorg-mode-dbf2c95774dea28b04f421e907ba1c81590adda0.tar.gz
Revert "Merge branch 'maint'"
This reverts commit cadb9f3603f7be0042c1ed30f7f8c3b44b81674e, reversing changes made to f6be2b5aa3cb0586b8c9a9bdda923528a9b8f081.
-rw-r--r--README_maintainer7
-rwxr-xr-xlisp/org.el6
2 files changed, 4 insertions, 9 deletions
diff --git a/README_maintainer b/README_maintainer
index 458b9ba..6b162aa 100644
--- a/README_maintainer
+++ b/README_maintainer
@@ -34,8 +34,7 @@ release.
When doing a /major release/, make sure all changes from the maint
branch are merged into the the master branch, then merge the master
-branch back into maint to synchronize the two. Further, make sure to
-update the Version and Package-Requires headers in org.el.
+branch back into maint to synchronize the two.
** Minor release
@@ -43,9 +42,7 @@ The release number for minor releases look like this: =7.13.1=
Minor releases are small amends to main releases. Usually they fix
critical bugs discovered in a main release. Minor bugs are usually
-not fixed -- they will be addressed in the next main release. Make
-sure to update the Version header in org.el when making a new minor
-release.
+not fixed -- they will be adressed in the next main release.
Only the fix to the bug is bundled into a release, without the main
development work going on in the master branch. Since the bug fix
diff --git a/lisp/org.el b/lisp/org.el
index 119ff01..2750e8a 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4,11 +4,9 @@
;; Copyright (C) 2004-2015 Free Software Foundation, Inc.
;;
;; Author: Carsten Dominik <carsten at orgmode dot org>
-;; Maintainer: Bastien Guerry <bzg at gnu dot org>
-;; URL: http://orgmode.org
-;; Version: 8.3.1
+;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
;; Keywords: outlines, hypermedia, calendar, wp
-;; Package-Requires: ((emacs "23.2"))
+;; Homepage: http://orgmode.org
;;
;; This file is part of GNU Emacs.
;;