aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorGrégoire Jadi2013-06-12 17:06:09 +0200
committerGrégoire Jadi2013-06-12 17:06:09 +0200
commit32a590b04a10f6bbe92bc1519b9e5ba2d32cfabc (patch)
tree578be4eb2757a0716f252a269adc49fa9406556d /lib-src
parent5c77269b59c8d8d88fa91ec2c949294db1bb2131 (diff)
parente6fa6da6899bf1b4877b96c450eae3934085d560 (diff)
downloademacs-32a590b04a10f6bbe92bc1519b9e5ba2d32cfabc.tar.gz
emacs-32a590b04a10f6bbe92bc1519b9e5ba2d32cfabc.zip
Merge branch 'jave-xwidget' into xwidget
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog4
-rw-r--r--lib-src/Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e565983e147..e1025fc5f6b 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
12013-05-29 Eli Zaretskii <eliz@gnu.org>
2
3 * Makefile.in (mostlyclean): Remove *.res files.
4
12013-05-18 Paul Eggert <eggert@cs.ucla.edu> 52013-05-18 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Port --enable-gcc-warnings to clang. 7 Port --enable-gcc-warnings to clang.
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
280mostlyclean: 280mostlyclean:
281 -rm -f core *.o 281 -rm -f core *.o *.res
282 282
283clean: mostlyclean 283clean: mostlyclean
284 -rm -f ${EXE_FILES} 284 -rm -f ${EXE_FILES}