diff options
| author | Ted Zlatanov | 2014-11-26 21:31:11 -0500 |
|---|---|---|
| committer | Ted Zlatanov | 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 emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.zip | |
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 @@ | |||
| 1 | *.aux | ||
| 2 | *.cp | ||
| 3 | *.cps | ||
| 4 | *.dvi | ||
| 5 | *.fn | ||
| 6 | *.fns | ||
| 7 | *.ky | ||
| 8 | *.kys | ||
| 9 | *.log | ||
| 10 | *.op | ||
| 11 | *.ops | ||
| 12 | |||
| 13 | *.pg | ||
| 14 | *.pgs | ||
| 15 | *.ps | ||
| 16 | *.tmp | ||
| 17 | *.toc | ||
| 18 | *.tp | ||
| 19 | *.tps | ||
| 20 | *.vr | ||
| 21 | *.vrs | ||
| 22 | Makefile | ||
| 23 | makefile | ||