diff options
| author | Ted Zlatanov <tzz@lifelogs.com> | 2014-11-26 21:31:11 -0500 |
|---|---|---|
| committer | Ted Zlatanov <tzz@lifelogs.com> | 2014-11-26 21:31:11 -0500 |
| commit | ba4502fe1465f7803beca3ae187e41f0b25bef10 (patch) | |
| tree | de8bdc219eeeba72e1a8b271ac96234c3c5af447 /doc/misc | |
| parent | b121ef10f500c0377c2ce665e8ccd8b97a6aedfd (diff) | |
| parent | 81e0cca7bbc99dbfda898a8aaab740ae121cf045 (diff) | |
| download | emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.tar.gz | |
Merge branch 'emacs-24'
Conflicts:
nt/addsection.c
nt/inc/ms-w32.h
src/w32.c
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/.gitignore | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/doc/misc/.gitignore b/doc/misc/.gitignore deleted file mode 100644 index 3ff56b474dd..00000000000 --- a/doc/misc/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -*.aux -*.cp -*.cps -*.dvi -*.fn -*.fns -*.ky -*.kys -*.log -*.op -*.ops -*.pdf -*.pg -*.pgs -*.ps -*.tmp -*.toc -*.tp -*.tps -*.vr -*.vrs -Makefile -makefile |