diff options
| author | Kenichi Handa | 2012-08-22 18:03:03 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-08-22 18:03:03 +0900 |
| commit | 4ff819d728960bf5e52b72501c606f4bb3fde028 (patch) | |
| tree | d8f0d96db0215f253bd0a4bbf7b9cda177e662ce /lib-src | |
| parent | d75ffb4ed0b2e72a9361a07d16a5c884a9459728 (diff) | |
| parent | 8223e9280fa69afeeae1a8b51735cbb8393f2e8d (diff) | |
| download | emacs-4ff819d728960bf5e52b72501c606f4bb3fde028.tar.gz emacs-4ff819d728960bf5e52b72501c606f4bb3fde028.zip | |
merge trunk
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 4 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f3fd3751005..fe90917a70b 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-08-17 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * makefile.w32-in ($(BLD)/regex.$(O)): Update dependencies. | ||
| 4 | |||
| 1 | 2012-08-15 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2012-08-15 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | * etags.c (Pascal_functions): Fix parenthesization typo. | 7 | * etags.c (Pascal_functions): Fix parenthesization typo. |
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index a03d761e7ec..64974b88b6f 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in | |||
| @@ -451,6 +451,7 @@ $(BLD)/profile.$(O) : \ | |||
| 451 | $(BLD)/regex.$(O) : \ | 451 | $(BLD)/regex.$(O) : \ |
| 452 | $(SRC)/regex.c \ | 452 | $(SRC)/regex.c \ |
| 453 | $(SRC)/regex.h \ | 453 | $(SRC)/regex.h \ |
| 454 | $(NT_INC)/stdbool.h \ | ||
| 454 | $(NT_INC)/unistd.h \ | 455 | $(NT_INC)/unistd.h \ |
| 455 | $(CONFIG_H) | 456 | $(CONFIG_H) |
| 456 | 457 | ||