Paul Eggert 6ddd819467 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		2015-01-01 10:47:17 -08:00
..
ChangeLog	Merge from origin/emacs-24	2015-01-01 10:47:17 -08:00
ctags.1	Nuke arch-tags.	2011-01-15 15:16:57 -08:00
ebrowse.1	Add 2014 to more copyright years	2014-01-02 11:18:24 -08:00
emacs.1.in	Further reduce the number of versioned files storing the version number	2014-11-09 18:01:56 -08:00
emacsclient.1	* doc/man/emacsclient.1: Tiny markup fix	2014-10-30 19:18:53 -04:00
etags.1	Add 2014 to more copyright years	2014-01-02 11:18:24 -08:00