diff options
| author | Bastien Guerry <bzg@altern.org> | 2012-03-17 14:34:01 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-03-17 14:34:01 +0100 |
| commit | 6e534f9c61d96c80276c8b00971bba746ad5e9fa (patch) | |
| tree | 07bd35d39ba6cbf0b44ba2dd2189da3acb71baf5 /contrib/scripts/org2hpda | |
| parent | d254b05500657250ab2ddd729b7182e7375b7678 (diff) | |
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.
Diffstat (limited to 'contrib/scripts/org2hpda')
| -rwxr-xr-x | contrib/scripts/org2hpda | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/scripts/org2hpda b/contrib/scripts/org2hpda index b59b6a3cf..6b308f38b 100755 --- a/contrib/scripts/org2hpda +++ b/contrib/scripts/org2hpda @@ -1,5 +1,5 @@ # org2hpda - a small utility to generate hipster pda style printouts from org mode -# Copyright (C) 2007-2012 Christian Egli +# Copyright (C) 2007 Christian Egli # # Version: 0.6 # |