ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,807 Commits 2 Branches 439 Tags 111 MiB
Commit Graph

7 Commits

Author SHA1 Message Date
Bastien Guerry de42649f7b Manually revert maint to e85080. 
e85080 is the last correct commit in the maint branch
before releasing 7.8.04.  The 7.8.05 release should be
done from this commit.
 2012-03-17 16:28:46 +01:00
Bastien Guerry fdc20f7792 Fix more copyright years. 2012-03-17 14:39:43 +01:00
Bastien Guerry 6e534f9c61 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.
 2012-03-17 14:34:01 +01:00
Bastien Guerry e44d2975ff Fix copyright (to 2012) year and Org version (to 7.8.03). 2012-01-03 18:47:01 +01:00
Bastien Guerry 28a338ea3a contrib/lisp/org-jira.el: remove Creative Commons license. 
This license was just a leftover and is not compatible with
the GPLv2 license Jonathan wants to use for this file.
 2011-08-15 20:10:04 +02:00
Carsten Dominik a2f787a643 New contributed modules org-mac-iCal.el by Christopher Suckling 2009-06-06 07:59:19 +02:00
Carsten Dominik ae2526fc94 org-jira.el: New file, by Jonathan Arkell 2009-06-05 09:02:55 +02:00