aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2014-07-31 17:01:44 -0700
committerPaul Eggert2014-07-31 17:01:44 -0700
commit43a762dae9b0d6c6285c0a28cc88b54895912276 (patch)
tree80b5967de6bacb3347bcf33df3a11966b59b51b5 /src/ChangeLog
parent5c6476b48a2d00bef6ada92fa210ac7cd1bc9a77 (diff)
downloademacs-43a762dae9b0d6c6285c0a28cc88b54895912276.tar.gz
emacs-43a762dae9b0d6c6285c0a28cc88b54895912276.zip
* frame.c (x_set_frame_parameters): Fix typo in previous patch.
I had confused && with ||.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f3ab7f9b990..9dbd7c97a53 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-08-01 Paul Eggert <eggert@cs.ucla.edu>
2
3 * frame.c (x_set_frame_parameters): Fix typo in previous patch.
4 I had confused && with ||.
5
12014-07-31 Paul Eggert <eggert@cs.ucla.edu> 62014-07-31 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Simplify timerfd configuration and fix some minor glitches. 8 Simplify timerfd configuration and fix some minor glitches.