diff options
| author | Johannes Pfau <jpfau@gcc.gnu.org> | 2019-03-23 15:07:16 +0000 |
|---|---|---|
| committer | Johannes Pfau <jpfau@gcc.gnu.org> | 2019-03-23 15:07:16 +0000 |
| commit | 686e44763e7bdb1ee1561bc91ce65661d28f3e65 (patch) | |
| tree | ddd47687f8f99855abea8f1e8e016b8add222cc7 /libphobos | |
| parent | e6b853501ba25b09edb5c6adf6ffc59a1ceea941 (diff) | |
[libphobos] Update MERGE file, remove ill-formatted changelog entry
Changelog entries are not required for upstream merges.
From-SVN: r269887
Diffstat (limited to 'libphobos')
| -rw-r--r-- | libphobos/ChangeLog | 5 | ||||
| -rw-r--r-- | libphobos/src/MERGE | 2 |
2 files changed, 1 insertions, 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 <johannespfau@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.edlinger@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. |