Paul Eggert 37ad855a38 Merge from origin/emacs-24 ... f160106 Avoid assertion violations in Rmail due to newline cache 1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote 1817892 Avoid erratic behavior of menu-bar tooltips on w32 (Bug#19925) 0260932 Bump python.el version b0adfc7 Spelling fixes 35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks. 6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching 65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged. 86fe750 # Remove NEWS temporary markup 4fa778b erc.el: Add old version header for package.el compatibilty 9366f05 Tramp: Disable paging with PAGER=cat Conflicts: admin/notes/repo etc/NEWS lisp/ChangeLog lisp/erc/ChangeLog src/ChangeLog		2015-03-03 14:41:30 -08:00
..
bugtracker
copyright	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
documentation
elpa
font-backend	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
git-workflow	admin: Add documentation for gitmerge.el	2014-11-27 23:23:48 +01:00
hydra	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
multi-tty	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
newfile
nextstep
repo	Merge from origin/emacs-24	2015-03-03 14:41:30 -08:00
tags
trailing-whitespace
unicode	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
versioning
www	Update copyright year to 2015	2015-01-01 14:26:41 -08:00
years