Change URLs to point http://winmerge.org (As discussed in BUG #916674 Hardcoded url...

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index c9ef097..14dd269 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1816,7 +1816,7 @@ void CMainFrame::UpdateResources()
 void CMainFrame::OnHelpContents() 
 {
        CString spath = GetModulePath(0) + _T("\\Docs\\index.html");
-       CString url = _T("http://winmerge.sourceforge.net/docs20/index.html");
+       CString url = _T("http://winmerge.org/docs20/index.html");
 
        CFileStatus status;
        if (CFile::GetStatus(spath, status))

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 669a4a8..58b102a 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -415,7 +415,7 @@ BOOL CAboutDlg::OnInitDialog()
        }
 
        m_ctlCompany.SetWindowText(version.GetLegalCopyright());
-       m_ctlWWW.m_link = _T("http://winmerge.sourceforge.net");
+       m_ctlWWW.m_link = _T("http://winmerge.org");
 
        UpdateData(FALSE);
        

diff --git a/Src/readme.txt b/Src/readme.txt
index c30a9a0..fc0a88e 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,7 +1,10 @@
 2004-03-15 Kimmo
  RFE: [ 874366 ] Add goto line-number
-   Scroll line searched to center of view, as suggested by harry mckame
+  Scroll line searched to center of view, as suggested by harry mckame
   Src: MergeEditView.cpp
+ Change URLs to point http://winmerge.org 
+  (As discussed in BUG #916674 Hardcoded url to help and website from help-menu)
+  MainFrm.cpp Merge.cpp
 
 2004-03-14 Kimmo
  RFE [ 897975 ] Syntax highlighting for INI files