ChangeLog-caf: Deleted and put info into

2018-08-27  Thomas Koenig  <tkoenig@gcc.gnu.org>

	* ChangeLog-caf: Deleted and put info into
	* gcc/fortran/ChangeLog.dev: Here and
	* libgfortran/ChangeLog.dev: Here.

From-SVN: r263894

diff --git a/ChangeLog-caf b/ChangeLog-caf
deleted file mode 100644 (file)
index 85af8c5..0000000
--- a/ChangeLog-caf
+++ /dev/null
@@ -1,11 +0,0 @@
-2018-08-21  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-       * Changelog-caf: New file.
-       * Merged branch from r263319 to r263752.
-
-2018-08-21  Thomas Koenig  <tkoenig@gcc.gnu.org>
-
-       * libgfortran/Makefile.am: Added handling of multi.c library.
-       * libgfortran/Makefile.in: Regenerated.
-       * libgfortran/caf/multi.c: New file (for now, just
-       copied over from single.c).

diff --git a/gcc/fortran/ChangeLog.dev b/gcc/fortran/ChangeLog.dev
index 829a1645d174b2e32b86a3ff3f9f74e563c5e96c..fec50783f8df6bbf574e5a6b57ccb73d07c04e91 100644 (file)
--- a/gcc/fortran/ChangeLog.dev
+++ b/gcc/fortran/ChangeLog.dev
@@ -1,3 +1,7 @@
 2018-08-26  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        * Development log for native coarray fortran.
+
+2018-08-21  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       * Merged branch from r263319 to r263752.

diff --git a/libgfortran/ChangeLog.dev b/libgfortran/ChangeLog.dev
index 829a1645d174b2e32b86a3ff3f9f74e563c5e96c..a02f7a11c05874723701b82d54be9e920b968967 100644 (file)
--- a/libgfortran/ChangeLog.dev
+++ b/libgfortran/ChangeLog.dev
@@ -1,3 +1,15 @@
 2018-08-26  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        * Development log for native coarray fortran.
+
+2018-08-21  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       * Merged branch from r263319 to r263752.
+
+2018-08-21  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       * libgfortran/Makefile.am: Added handling of multi.c library.
+       * libgfortran/Makefile.in: Regenerated.
+       * libgfortran/caf/multi.c: New file (for now, just
+       copied over from single.c).
+