Mercurial > public > mercurial-scm > hg-stable
diff mercurial/simplemerge.py @ 15782:7de7630053cb
Remove FSF mailing address from GPL headers
The GPLv3 FAQ suggests to upgrade by
[...] replace all your existing v2 license notices (usually at the
top of each file) with the new recommended text available on the GNU
licenses howto. It's more future-proof because it no longer includes
the FSF's postal mailing address.
This removes the postal address, but leaves the version number at 2+.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 06 Jan 2012 16:27:13 +0100 |
| parents | c519cd8f0169 |
| children | 525fdb738975 |
line wrap: on
line diff
--- a/mercurial/simplemerge.py Fri Jan 06 16:16:58 2012 +0100 +++ b/mercurial/simplemerge.py Fri Jan 06 16:27:13 2012 +0100 @@ -11,8 +11,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# along with this program; if not, see <http://www.gnu.org/licenses/>. # mbp: "you know that thing where cvs gives you conflict markers?" # s: "i hate that."