diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-01 10:47:17 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-01-01 10:47:17 -0800 |
| commit | 6ddd819467d1d9d0e78f13e5a15c1af9125ae67b (patch) | |
| tree | bb6782a87dc52bed05166ac4ae458998c3418e70 /doc/misc | |
| parent | 935fa6151b3e411c5308d62338744ff25f1a8ddb (diff) | |
| parent | a5f90a37622e9d0cb066da413846c1c3f6900b51 (diff) | |
| download | emacs-6ddd819467d1d9d0e78f13e5a15c1af9125ae67b.tar.gz emacs-6ddd819467d1d9d0e78f13e5a15c1af9125ae67b.tar.bz2 emacs-6ddd819467d1d9d0e78f13e5a15c1af9125ae67b.zip | |
Merge from origin/emacs-24
a5f90a3 * .gitattributes: New file.
5a9710f Make sure tool-bar changes are reflected on display.
93796ba * autogen.sh: Port better to non-GNU 'cp'.
9758516 Fix a typo in a comment in the previous commit.
aa472a3 Fix the pixel coordinates returned by pos-visible-in-window-p. (Bug#19473)
d261229 * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): New defun. (tramp-test30-special-characters): Use it. (tramp--test-check-files): Filter nil file names out.
9278f05 Omit trailing white space
1c93fd3 Sync with Tramp 2.2.11.
96ebe18 Sync with Tramp 2.2.11.
e792450 Sync with Tramp 2.2.11.
2d17e12 Fix ChangeLog entry.
6444482 Fix auto-revert-tail-mode for remote files
b5c9c13 Spelling fixes
c5504d1 src/w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458)
Conflicts:
ChangeLog
doc/misc/ChangeLog
lisp/ChangeLog
src/ChangeLog
test/ChangeLog
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/trampver.texi | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 285d5b32a88..3ae626f49ef 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2015-01-01 Michael Albinus <michael.albinus@gmx.de> + + Sync with Tramp 2.2.11. + * trampver.texi: Update release number. + 2014-12-31 Paul Eggert <eggert@cs.ucla.edu> Less 'make' chatter for Emacs doc diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index cfcb6640183..ab13dedd6f2 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -8,7 +8,7 @@ @c In the Tramp GIT, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.2.11-pre +@set trampver 2.2.11 @c Other flags from configuration @set instprefix /usr/local |