diff options
| author | Tobias Burnus <burnus@net-b.de> | 2016-09-20 21:49:12 +0000 |
|---|---|---|
| committer | Tobias Burnus <burnus@net-b.de> | 2016-09-20 21:49:12 +0000 |
| commit | abf704d05073530028336551d8565aca6403e985 (patch) | |
| tree | 0ac440db6513ee01deb5e5dc6142769d1e5b7b2d /libbacktrace/simple.c | |
| parent | c720aaa3bf123cbfabe14016711f3683d840b6a5 (diff) | |
| parent | 168ff71ac9c1c9ad651456fc6350b3ab43e6aa2a (diff) | |
Merge from trunk (r239915 to r240230)fortran-dev
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/fortran-dev@240290 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libbacktrace/simple.c')
| -rw-r--r-- | libbacktrace/simple.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbacktrace/simple.c b/libbacktrace/simple.c index 018773a7e5d..493fd6de780 100644 --- a/libbacktrace/simple.c +++ b/libbacktrace/simple.c @@ -7,13 +7,13 @@ modification, are permitted provided that the following conditions are met: (1) Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. + notice, this list of conditions and the following disclaimer. (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the - distribution. - + distribution. + (3) The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission. |