diff options
| author | Glenn Morris | 2012-06-28 23:28:37 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-06-28 23:28:37 -0700 |
| commit | c8d3a25c0981020e1b8aa3bf96a4a0059be82431 (patch) | |
| tree | 46a76faa5df111a6bea439330ea26bea1cc85585 /src/ChangeLog | |
| parent | 5437effdb836355436f5f986e46baa6a41ec0966 (diff) | |
| parent | 3d8b9024adf6136edd3f7b7edf70a88b6ab8a61b (diff) | |
| download | emacs-c8d3a25c0981020e1b8aa3bf96a4a0059be82431.tar.gz emacs-c8d3a25c0981020e1b8aa3bf96a4a0059be82431.zip | |
Merge from emacs-24; up to 2012-04-30T11:57:47Z!sdl.web@gmail.com
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 09fc8fbfda2..29fc2561c03 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2012-06-29 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * gnutls.c (emacs_gnutls_handshake): | ||
| 4 | Add QUIT to make the loop interruptible. | ||
| 5 | |||
| 6 | 2012-06-29 Glenn Morris <rgm@gnu.org> | ||
| 7 | |||
| 8 | * charset.c (init_charset): Make lack of etc/charsets fatal. | ||
| 9 | |||
| 1 | 2012-06-29 Dmitry Antipov <dmantipov@yandex.ru> | 10 | 2012-06-29 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 11 | ||
| 3 | * editfns.c (region_limit): Fix type mismatch. | 12 | * editfns.c (region_limit): Fix type mismatch. |