diff options
| author | Joakim Verona | 2013-06-12 12:32:25 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-06-12 12:32:25 +0200 |
| commit | e6fa6da6899bf1b4877b96c450eae3934085d560 (patch) | |
| tree | 48e6fda463d24a792ec8428fb8044a250ee2ff82 /lib-src/Makefile.in | |
| parent | 4f0994366d33f8f76db4662cc126720866df3461 (diff) | |
| parent | 84d6f46535554f9f51aae3314313112e8d755c65 (diff) | |
| download | emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.tar.gz emacs-e6fa6da6899bf1b4877b96c450eae3934085d560.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/Makefile.in
src/keyboard.c
src/termhooks.h
Diffstat (limited to 'lib-src/Makefile.in')
| -rw-r--r-- | lib-src/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index e0acea867b7..f32333fe765 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -278,7 +278,7 @@ uninstall: | |||
| 278 | fi | 278 | fi |
| 279 | 279 | ||
| 280 | mostlyclean: | 280 | mostlyclean: |
| 281 | -rm -f core *.o | 281 | -rm -f core *.o *.res |
| 282 | 282 | ||
| 283 | clean: mostlyclean | 283 | clean: mostlyclean |
| 284 | -rm -f ${EXE_FILES} | 284 | -rm -f ${EXE_FILES} |