diff options
| author | Ted Zlatanov | 2014-11-26 21:31:11 -0500 |
|---|---|---|
| committer | Ted Zlatanov | 2014-11-26 21:31:11 -0500 |
| commit | ba4502fe1465f7803beca3ae187e41f0b25bef10 (patch) | |
| tree | de8bdc219eeeba72e1a8b271ac96234c3c5af447 /src/ChangeLog | |
| parent | b121ef10f500c0377c2ce665e8ccd8b97a6aedfd (diff) | |
| parent | 81e0cca7bbc99dbfda898a8aaab740ae121cf045 (diff) | |
| download | emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.tar.gz emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.zip | |
Merge branch 'emacs-24'
Conflicts:
nt/addsection.c
nt/inc/ms-w32.h
src/w32.c
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index df704efdf2d..e6bbeb8b864 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2014-11-17 Oscar Fuentes <ofv@wanadoo.es> | ||
| 2 | |||
| 3 | * src/w32.c: Use MINGW_W64 instead of _W64. | ||
| 4 | |||
| 5 | * src/w32term.c: Likewise. | ||
| 6 | |||
| 7 | 2014-11-16 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 8 | |||
| 9 | * frame.c (Fhandle_switch_frame): Deactivate shift-region (bug#19003). | ||
| 10 | |||
| 1 | 2014-11-26 Lars Magne Ingebrigtsen <larsi@gnus.org> | 11 | 2014-11-26 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 12 | ||
| 3 | * gnutls.c (gnutls_ip_address_p): New function. | 13 | * gnutls.c (gnutls_ip_address_p): New function. |