view admin/notes/BRANCH @ 66262:c3855d669e33

* textmodes/org.el (org-combined-agenda-icalendar-file) (org-icalendar-include-todo, org-icalendar-combined-name): New options. (org-export-icalendar-this-file) (org-export-icalendar-all-agenda-files) (org-export-icalendar-combine-agenda-files): New commands. (org-export-icalendar, org-print-icalendar-entries) (org-start-icalendar-file, org-finish-icalendar-file) (org-ical-ts-to-string): New functions. (org-read-date, org-goto-calendar) (org-agenda-goto-calendar): Inhibit displaying diary entries by call to `calendar'. (orgtbl-setup): Removed the :keys arguments from the menu description. (org-after-save-iCalendar-file-hook): New variable.

This file describes the CVS branch in which it is maintained.
Everything below the line is branch-specific.
________________________________________________________________________

This is the "HEAD" branch, otherwise known as the "trunk".  Its primary
purpose is to accumulate changes that are not yet partitioned into a
specific (versioned) release.  When people say "use CVS emacs", this is
the branch they are talking about.  Likewise, a "cvs checkout" without
the "-r" option results in this branch.

The plans for this branch are not specified; Emacs hackers add to it
relatively free of constraint (aside from proper legal / accounting
practices), although sometimes there is related discussion on the
emacs-devel mailing list.

The closure process for this branch is undocumented; concepts such as
"freeze", "release", or "integration with the trunk" are not applicable
to this branch.