aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog.name-lookup
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog.name-lookup')
-rw-r--r--ChangeLog.name-lookup2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog.name-lookup b/ChangeLog.name-lookup
index fd7fe12..f5ce219 100644
--- a/ChangeLog.name-lookup
+++ b/ChangeLog.name-lookup
@@ -1,5 +1,7 @@
2018-08-20 Nathan Sidwell <nathan@acm.org>
+ Merge trunk r263669.
+
Merge trunk r263667.
Merge trunk r263658.