diff options
| author |  Todd Zullinger <tmz@pobox.com> | 2017-11-07 00:39:33 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-11-09 13:21:21 +0900 |
| commit | 484257925fada31045aefec7484fd663f7c40c2f (patch) | |
| tree | 938b57996b924fe9897e5fd90b3b1e61446e03df /xdiff/xmerge.c | |
| parent | Git 2.15 (diff) | |
| download | tgif-484257925fada31045aefec7484fd663f7c40c2f.tar.xz | |
Replace Free Software Foundation address in license notices
The mailing address for the FSF has changed over the years. Rather than
updating the address across all files, refer readers to gnu.org, as the
GNU GPL documentation now suggests for license notices. The mailing
address is retained in the full license files (COPYING and LGPL-2.1).
The old address is still present in t/diff-lib/COPYING. This is
intentional, as the file is used in tests and the contents are not
expected to change.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
| -rw-r--r-- | xdiff/xmerge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c index f338ad6c75..1659edb453 100644 --- a/xdiff/xmerge.c +++ b/xdiff/xmerge.c @@ -13,8 +13,8 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; if not, see + * <http://www.gnu.org/licenses/>. * * Davide Libenzi <davidel@xmailserver.org> * |