diff options
| author | Paul Eggert | 2016-02-09 14:23:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-02-09 14:23:10 -0800 |
| commit | a9650e970d9f515b4b64bd0009d28125b4276b63 (patch) | |
| tree | 72495a45c9e58f16f6b09448f6956507da6ccf89 /src | |
| parent | b3fc7a3e763fb260cd932dc6aedbe7b4c810a73c (diff) | |
| parent | 35cbe2095ba024f6ee60799cd560771f2ef739a4 (diff) | |
| download | emacs-a9650e970d9f515b4b64bd0009d28125b4276b63.tar.gz emacs-a9650e970d9f515b4b64bd0009d28125b4276b63.zip | |
; Merge from origin/emacs-25
The following commit was skipped:
35cbe20 src/process.c Correctly convert AF_INET6 addresses
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions