diff options
| author | Kenichi Handa | 2012-11-27 22:03:42 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-11-27 22:03:42 +0900 |
| commit | 45d0fdd8f0a7e4679931a9703fd0bb715552288b (patch) | |
| tree | 2bef73a476ad16ccf423616795ad71884944f6c0 /admin | |
| parent | 2aaec2d9be5cec44ea3b59cba476fd3e091f2fc9 (diff) | |
| parent | 026822f9666e1ff2830a561c7f26c50099d2a6ff (diff) | |
| download | emacs-45d0fdd8f0a7e4679931a9703fd0bb715552288b.tar.gz emacs-45d0fdd8f0a7e4679931a9703fd0bb715552288b.zip | |
merge trunk
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/CPP-DEFINES | 1 | ||||
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rw-r--r-- | admin/make-tarball.txt | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index f4105f00c47..20c97f886dd 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES | |||
| @@ -259,7 +259,6 @@ HAVE_MEMSET | |||
| 259 | HAVE_MENUS | 259 | HAVE_MENUS |
| 260 | HAVE_MKSTEMP | 260 | HAVE_MKSTEMP |
| 261 | HAVE_MMAP | 261 | HAVE_MMAP |
| 262 | HAVE_MOUSE | ||
| 263 | HAVE_MULTILINGUAL_MENU | 262 | HAVE_MULTILINGUAL_MENU |
| 264 | HAVE_NANOTIME | 263 | HAVE_NANOTIME |
| 265 | HAVE_NET_IF_DL_H | 264 | HAVE_NET_IF_DL_H |
diff --git a/admin/ChangeLog b/admin/ChangeLog index fe75ae57a6d..05c1463d325 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-11-24 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * CPP-DEFINES (HAVE_MOUSE): Remove. | ||
| 4 | |||
| 1 | 2012-11-23 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-11-23 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958). | 7 | Assume POSIX 1003.1-1988 or later for dirent.h (Bug#12958). |
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index ea9c4a3c2d1..eda28b639d2 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt | |||
| @@ -57,8 +57,7 @@ For each step, check for possible errors. | |||
| 57 | M-x ediff. Especially check that Info files aren't built. | 57 | M-x ediff. Especially check that Info files aren't built. |
| 58 | 58 | ||
| 59 | 10. cd EMACS_ROOT_DIR; bzr tag TAG | 59 | 10. cd EMACS_ROOT_DIR; bzr tag TAG |
| 60 | TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a | 60 | TAG is emacs-XX.Y.ZZ for a pretest, emacs-XX.Y for a release. |
| 61 | release. | ||
| 62 | 61 | ||
| 63 | Shortly before the release, cut the version branch also, and open | 62 | Shortly before the release, cut the version branch also, and open |
| 64 | a Savannah support request asking for commits to the new branch to | 63 | a Savannah support request asking for commits to the new branch to |