diff options
| author | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-21 12:42:16 -0400 |
| commit | cafdcef32d55cbb44389d7e322e7f973cbb72dfd (patch) | |
| tree | 7ee0c41ea8a589650ce6f4311fb10e61a63807b9 /admin/notes/BRANCH | |
| parent | a08a25d7aaf251aa18f2ef747be53734bc55cae9 (diff) | |
| parent | 4e05e67e4cd0bc1b0a4ef3176a4d0d91c6b3738e (diff) | |
| download | emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.tar.gz emacs-cafdcef32d55cbb44389d7e322e7f973cbb72dfd.zip | |
Merge from trunk
Diffstat (limited to 'admin/notes/BRANCH')
| -rw-r--r-- | admin/notes/BRANCH | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/admin/notes/BRANCH b/admin/notes/BRANCH index 53f3d9603ca..9f09135f206 100644 --- a/admin/notes/BRANCH +++ b/admin/notes/BRANCH | |||
| @@ -23,3 +23,10 @@ on what branch at any time. | |||
| 23 | If you are looking at this file in a branch other than the trunk, | 23 | If you are looking at this file in a branch other than the trunk, |
| 24 | there may be some branch-specific documentation below this line. | 24 | there may be some branch-specific documentation below this line. |
| 25 | ________________________________________________________________________ | 25 | ________________________________________________________________________ |
| 26 | |||
| 27 | * elpa | ||
| 28 | |||
| 29 | This branch does not contain a copy of Emacs, but of the Emacs Lisp | ||
| 30 | package archive (elpa.gnu.org). See admin/notes/elpa for further | ||
| 31 | explanation, and the README file in the branch for usage | ||
| 32 | instructions. | ||