| commit | 8d99e233147d44c2176cef599db754d06b12f5e3 | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Thu, 9 Nov 2017 03:22:26 +0000 (8 19:22 -0800) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Thu, 9 Nov 2017 03:22:26 +0000 (8 19:22 -0800) | ||
| tree | 1c98a8e6b702bc3b10fab1d8a2ade1fda4f938a6 | treesnapshot (tar.gz zip) |
| parent | d5ccb74848658d20a7b31ea3a2bf5a090468fd5d | commitdiff |
| parent | 6c3031399b796feceaab2bdfe94abe7170db4e34 | commitdiff |
Merge from origin/emacs-26
6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t...
98288ecaff Further workaround for faulty localtime() under macOS 10.6
6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t...
98288ecaff Further workaround for faulty localtime() under macOS 10.6
| admin/gitmerge.el | diff1 | diff2 | blobhistory |
| lisp/org/org-clock.el | diff1 | diff2 | blobhistory |