diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-28 00:07:00 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-28 00:07:00 -0800 |
| commit | 1505643bb70ce66e86d6c72902fe7e9199e93606 (patch) | |
| tree | 0287f1d5f6ff9f6e25184fc843dddb7fe5125257 /src/w32.h | |
| parent | 9bb10cbdc59486c2131cea9b5399e9cbdc0418ab (diff) | |
| parent | b54f5721bfb6bf21cac5402cf34a8130e11bfb70 (diff) | |
| download | emacs-1505643bb70ce66e86d6c72902fe7e9199e93606.tar.gz emacs-1505643bb70ce66e86d6c72902fe7e9199e93606.tar.bz2 emacs-1505643bb70ce66e86d6c72902fe7e9199e93606.zip | |
Merge from origin/emacs-24
b54f572 Port memory-full checking to GnuTLS 3.3
Conflicts:
src/ChangeLog
src/gnutls.c
Diffstat (limited to 'src/w32.h')
0 files changed, 0 insertions, 0 deletions