Eli Zaretskii 84c7b3879c Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25		2015-11-13 22:03:12 +02:00
..
emacs	* doc/lispref/variables.texi (Directory Local Variables):	2015-11-10 14:45:50 +00:00
lispintro	; Add some comments	2015-10-04 14:42:45 +08:00
lispref	Remove support for ':timeout' from w32 tray notifications	2015-11-13 22:01:26 +02:00
man	Fix tagging of class members in C-like OO languages	2015-05-25 18:02:21 +03:00
misc	Adapt Tramp version, do not merge with master	2015-11-13 17:41:55 +01:00