mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 06:50:46 -08:00
Code Issues Projects Releases Wiki Activity
emacs/admin/notes
History
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 Lessen focus on ChangeLog files, as opposed to change log entries. 2014-11-19 11:37:56 -08:00
copyright Update copyright year to 2015 2015-01-01 14:26:41 -08:00
documentation Standardize possessive apostrophe usage in manuals, docs, and comments 2012-02-28 00:17:21 -08:00
elpa * notes/elpa: Use "git" instead of "bzr" in the name of machine to 2014-06-16 23:29:08 +02:00
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 Lessen focus on ChangeLog files, as opposed to change log entries. 2014-11-19 11:37:56 -08:00
nextstep Fix typos. 2011-11-20 20:35:27 +01:00
repo Merge from origin/emacs-24 2015-03-03 14:41:30 -08:00
tags Git transition patch 2014-11-11 13:28:05 -05:00
trailing-whitespace Nuke arch-tags. 2011-01-15 15:16:57 -08:00
unicode Update copyright year to 2015 2015-01-01 14:26:41 -08:00
versioning * admin/notes/versioning: Relocate and rewrite. 2014-10-15 00:12:31 -07:00
www Update copyright year to 2015 2015-01-01 14:26:41 -08:00
years Backport changes in preparation for git migration from trunk. 2014-10-31 11:03:23 +02:00