From: hylom <hylom@users.sourceforge.jp>
Date: Mon, 25 Jan 2010 09:02:54 +0000 (+0900)
Subject: merge original branch.
X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=commitdiff_plain

merge original branch.
---

6bc717c0255121949c4e508d9fcbf3aeea95bddd
diff --cc src/TortoiseProc/GitLogListBase.cpp
index 04ebca9,3314727..b74a59b
--- a/src/TortoiseProc/GitLogListBase.cpp
+++ b/src/TortoiseProc/GitLogListBase.cpp
@@@ -178,7 -180,7 +180,7 @@@ END_MESSAGE_MAP(
  
  void CGitLogListBase::OnMeasureItem(int nIDCtl, LPMEASUREITEMSTRUCT lpMeasureItemStruct)
  {
--	// TODO: ÔÚ´ËÌí¼ÓÏûÏ¢´¦Àí³ÌÐò´úÂëºÍ/»òµ÷ÓÃĬÈÏÖµ
++	// TODO: ﾔﾚｴﾋﾌ�ﾓﾏûﾏ｢ｴｦﾀ�ﾌﾐòï½´úﾂ�ﾍ/ï½»òï½µ÷ﾓﾃﾄｬﾈﾏﾖｵ
  
  	CListCtrl::OnMeasureItem(nIDCtl, lpMeasureItemStruct);
  }
@@@ -2548,4 -2648,4 +2648,4 @@@ int CGitLogListBase::GetHeadIndex(
  		}
  	}
  	return -1;
--}
++}