diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /etc/emacs.py | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'etc/emacs.py')
| -rw-r--r-- | etc/emacs.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/etc/emacs.py b/etc/emacs.py index 964c1f17f40..24004b321fe 100644 --- a/etc/emacs.py +++ b/etc/emacs.py @@ -8,4 +8,3 @@ if sys.version_info[0] == 3: else: from emacs2 import * -# arch-tag: 894b5227-638f-45fd-8567-0417d5c35900 |