diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:39:12 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-03 14:39:12 -0800 |
commit | 36a50f38fbbcf5cc0cafc44af9d1bfcd6c13fc25 (patch) | |
tree | 8f2c148120694da902f3947e8bd097c0d0f469a8 /nt | |
parent | 923602fefbfadd47e0b675d97aa1b28a16971da0 (diff) | |
parent | 432b00e6597f2a1eec192d807ad554a430f96f93 (diff) | |
download | emacs-36a50f38fbbcf5cc0cafc44af9d1bfcd6c13fc25.tar.gz |
Merge from origin/emacs-24
The following commit was skipped:
432b00e Fix assertions in popping up menus on TTY (Bug#19862)
Diffstat (limited to 'nt')
0 files changed, 0 insertions, 0 deletions