This cleans up un uneeded changelog entry, as entries are not required for
upstream merges.
Also updates the MERGE file which I forgot in the last backport commit.
Commited as obvious.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@269887
138bc75d-0d04-0410-961f-82ee72b054a4
---
libphobos/ChangeLog | 5 -----
libphobos/src/MERGE | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index fc91bb63985..a2ccba0cddb 100644
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,8 +1,3 @@
-2019-03-02 Johannes Pfau <johannesp...@gmail.com>
-
- * src/std/digest/murmurhash.d: PR d/89177: Backport from upstream.
- Fixes unaligned data access (PR d/89177).
-
2019-02-19 Bernd Edlinger <bernd.edlin...@hotmail.de>
* src/Makefile.am: Avoid the -D option which is not available
diff --git a/libphobos/src/MERGE b/libphobos/src/MERGE
index 61c42525d44..63bd46834c5 100644
--- a/libphobos/src/MERGE
+++ b/libphobos/src/MERGE
@@ -1,4 +1,4 @@
-791c5d2407e500bb4e777d6a90fc96cf250ba2f6
+ef07932811de50a1d5810ea23462d127a60574a6
The first line of this file holds the git revision number of the last
merge done from the dlang/phobos repository.
--
2.19.2
