Update license file and fix don't show "push" after commit

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseGitSetup/License.rtf b/src/TortoiseGitSetup/License.rtf
index bc2b9b4..e159e57 100644 (file)
Binary files a/src/TortoiseGitSetup/License.rtf and b/src/TortoiseGitSetup/License.rtf differ

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 68e48c4..681bca3 100644 (file)
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -513,7 +513,7 @@ void CCommitDlg::OnOK()
                progress.m_GitCmd=cmd;\r
                progress.m_bShowCommand = FALSE;        // don't show the commit command\r
                progress.m_PreText = out;                       // show any output already generated in log window\r
-               progress.m_changeAbortButtonOnSuccessTo = "&Push";\r
+               progress.m_changeAbortButtonOnSuccessTo = _T("&Push");\r
                DWORD userResponse = progress.DoModal();\r
                \r
                if(progress.m_GitStatus)\r