diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /src/makefile.w32-in | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'src/makefile.w32-in')
| -rw-r--r-- | src/makefile.w32-in | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 272b053ed12..f4885580e1c 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in | |||
| @@ -813,7 +813,6 @@ $(BLD)/emacs.$(O) : \ | |||
| 813 | $(NT_INC)/sys/file.h \ | 813 | $(NT_INC)/sys/file.h \ |
| 814 | $(NT_INC)/unistd.h \ | 814 | $(NT_INC)/unistd.h \ |
| 815 | $(GNU_LIB)/close-stream.h \ | 815 | $(GNU_LIB)/close-stream.h \ |
| 816 | $(GNU_LIB)/ignore-value.h \ | ||
| 817 | $(ATIMER_H) \ | 816 | $(ATIMER_H) \ |
| 818 | $(BUFFER_H) \ | 817 | $(BUFFER_H) \ |
| 819 | $(CHARACTER_H) \ | 818 | $(CHARACTER_H) \ |
| @@ -1407,7 +1406,6 @@ $(BLD)/sysdep.$(O) : \ | |||
| 1407 | $(NT_INC)/sys/stat.h \ | 1406 | $(NT_INC)/sys/stat.h \ |
| 1408 | $(NT_INC)/unistd.h \ | 1407 | $(NT_INC)/unistd.h \ |
| 1409 | $(GNU_LIB)/execinfo.h \ | 1408 | $(GNU_LIB)/execinfo.h \ |
| 1410 | $(GNU_LIB)/ignore-value.h \ | ||
| 1411 | $(GNU_LIB)/utimens.h \ | 1409 | $(GNU_LIB)/utimens.h \ |
| 1412 | $(CONFIG_H) \ | 1410 | $(CONFIG_H) \ |
| 1413 | $(C_CTYPE_H) \ | 1411 | $(C_CTYPE_H) \ |