From 6d3c988561dd1648b9d497aeb3901dafa00312d7 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Fri, 21 Aug 2015 22:23:42 +0200 Subject: [PATCH] Revert "org.el: Add version header" This reverts commit 182552ee75bad48b062d3b0f7e8e9dce9c1b7965. --- README_maintainer | 7 ++----- lisp/org.el | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/README_maintainer b/README_maintainer index 458b9ba83..6b162aa52 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 a5f359837..a32358297 100755 --- a/lisp/org.el +++ b/lisp/org.el @@ -4,11 +4,9 @@ ;; Copyright (C) 2004-2015 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik -;; Maintainer: Bastien Guerry -;; URL: http://orgmode.org -;; Version: 8.3.1 +;; Maintainer: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp -;; Package-Requires: ((emacs "23.2")) +;; Homepage: http://orgmode.org ;; ;; This file is part of GNU Emacs. ;;