diff options
| author | Glenn Morris | 2010-04-15 10:22:07 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-04-15 10:22:07 -0700 |
| commit | 18bf657d18b461309650978dc0ecf29567f5d1f6 (patch) | |
| tree | 94281939850c32d0d3c25807a1b717f28ffb4543 /admin/notes | |
| parent | 82883f0a8e11bd4cf01321d51bc62df0d6a96d21 (diff) | |
| download | emacs-18bf657d18b461309650978dc0ecf29567f5d1f6.tar.gz emacs-18bf657d18b461309650978dc0ecf29567f5d1f6.zip | |
* admin/notes/BRANCH: Defer to emacs-devel.
Diffstat (limited to 'admin/notes')
| -rw-r--r-- | admin/notes/BRANCH | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/admin/notes/BRANCH b/admin/notes/BRANCH index 5caa9e5905f..53f3d9603ca 100644 --- a/admin/notes/BRANCH +++ b/admin/notes/BRANCH | |||
| @@ -17,9 +17,8 @@ trunk is then free for development. | |||
| 17 | For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for | 17 | For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for |
| 18 | 23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x. | 18 | 23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x. |
| 19 | 19 | ||
| 20 | Traditionally only bug-fixes were allowed in minor releases. | 20 | Consult emacs-devel for exactly what kinds of changes are allowed |
| 21 | Recently (22.x, 23.2), self-contained new features were allowed on a | 21 | on what branch at any time. |
| 22 | case-by-case basis. | ||
| 23 | 22 | ||
| 24 | 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, |
| 25 | there may be some branch-specific documentation below this line. | 24 | there may be some branch-specific documentation below this line. |