|
From: <ge...@us...> - 2007-11-21 22:01:33
|
Revision: 4784
http://winmerge.svn.sourceforge.net/winmerge/?rev=4784&view=rev
Author: gerundt
Date: 2007-11-21 14:01:32 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Introduction.xml
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MainFrm.cpp
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2007-11-21 21:44:19 UTC (rev 4783)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2007-11-21 22:01:32 UTC (rev 4784)
@@ -1,3 +1,7 @@
+2007-11-21 Tim
+ BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
+ Manual: Introduction.xml
+
2007-10-11 Kimmo
Bump manual version to 1.2.11 and update copyright year
Manual: WinMerge_help.xml
Modified: branches/R2_6/Docs/Users/Manual/Introduction.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Introduction.xml 2007-11-21 21:44:19 UTC (rev 4783)
+++ branches/R2_6/Docs/Users/Manual/Introduction.xml 2007-11-21 22:01:32 UTC (rev 4784)
@@ -27,7 +27,7 @@
reliable program to use.</para>
<para>Please note that WinMerge is not a freeware, but it is <ulink
- url="http://www.gnu.org/copyleft/gpl.html">GPL</ulink> licenced. We have
+ url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licenced. We have
given you a good tool for free, so please follow our licence and submit your
improvements back to us. We are happy to get help improving WinMerge
further. It is advantage for all WinMerge users.</para>
@@ -199,7 +199,7 @@
url="http://sourceforge.net/tracker/?group_id=13216&atid=313216">patches</ulink>
and help improve this product! If you publish your altered version, you
are required to publish changes source code too, it is what <ulink
- url="http://www.gnu.org/copyleft/gpl.html">GPL</ulink> licence is about.
+ url="http://www.gnu.org/licenses/gpl-2.0.html">GPL</ulink> licence is about.
Please respect it.</para>
<para>While WinMerge development has been fast in last couple of years,
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2007-11-21 21:44:19 UTC (rev 4783)
+++ branches/R2_6/Src/Changes.txt 2007-11-21 22:01:32 UTC (rev 4784)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2007-11-21 Tim
+ BUG: [ 1817626 ] Menu item "Help->GPL" links to GPLv3
+ Src: MainFrm.cpp
+
2007-11-11 Kimmo
PATCH: [ 1811745 ] Do not merge ignored differences (with multi selection)
Src: MergeDoc.cpp
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2007-11-21 21:44:19 UTC (rev 4783)
+++ branches/R2_6/Src/MainFrm.cpp 2007-11-21 22:01:32 UTC (rev 4784)
@@ -808,7 +808,7 @@
void CMainFrame::OnHelpGnulicense()
{
CString spath = GetModulePath() + _T("\\Copying");
- CString url = _T("http://www.gnu.org/copyleft/gpl.html");
+ CString url = _T("http://www.gnu.org/licenses/gpl-2.0.html");
OpenFileOrUrl(spath, url);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
