diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/ChangeLog.9 | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/ChangeLog.9')
| -rw-r--r-- | src/ChangeLog.9 | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index fc4f2d4ad37..3c3a5068939 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 | |||
| @@ -12476,9 +12476,9 @@ | |||
| 12476 | * atimer.c (stop_other_atimers): Don't call cancel_atimer because | 12476 | * atimer.c (stop_other_atimers): Don't call cancel_atimer because |
| 12477 | that unblocks alarms. | 12477 | that unblocks alarms. |
| 12478 | 12478 | ||
| 12479 | * alloc.c, bytecode.c, data.c, dispnew.c, ecrt0.c, editfns.c, | 12479 | * alloc.c, bytecode.c, data.c, dispnew.c, ecrt0.c, editfns.c: |
| 12480 | emacs.c, floatfns.c, fns.c, lread.c, print.c, config.in, lisp.h, | 12480 | * emacs.c, floatfns.c, fns.c, lread.c, print.c, config.in, lisp.h: |
| 12481 | Makefile.in: Remove `LISP_FLOAT_TYPE' and `standalone'. | 12481 | * Makefile.in: Remove `LISP_FLOAT_TYPE' and `standalone'. |
| 12482 | 12482 | ||
| 12483 | * frame.c (make_frame): Set frame initially to `garbaged'. | 12483 | * frame.c (make_frame): Set frame initially to `garbaged'. |
| 12484 | 12484 | ||
| @@ -13312,4 +13312,3 @@ See ChangeLog.8 for earlier changes. | |||
| 13312 | You should have received a copy of the GNU General Public License | 13312 | You should have received a copy of the GNU General Public License |
| 13313 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 13313 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 13314 | 13314 | ||
| 13315 | ;;; arch-tag: 38875948-6e89-4f08-b0ca-ff328f1e8b72 | ||