| commit | 6e534f9c61d96c80276c8b00971bba746ad5e9fa | |
| author | Bastien Guerry <bzg@altern.org> | |
| Sat, 17 Mar 2012 13:34:01 +0000 (17 14:34 +0100) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Sat, 17 Mar 2012 13:34:01 +0000 (17 14:34 +0100) | ||
| tree | 07bd35d39ba6cbf0b44ba2dd2189da3acb71baf5 | treesnapshot (tar.gz zip) |
| parent | d254b05500657250ab2ddd729b7182e7375b7678 | commitdiff |
Manually revert back to commit e85080.
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.
This commit reverts back the maint branch to its state before
merging the master branch. From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
This fixes a wrong merge that should not have happened:
commit 7e903a merges the master branch into the maint branch,
while we really want to keep the maint branch a bugfix-only
branch.
This commit reverts back the maint branch to its state before
merging the master branch. From there, we will fix remaining
problems with the maint branch (e.g. copyright issues) then
release this maint branch as Org-mode 7.8.05.
165 files changed: