diff options
Diffstat (limited to 'src/mergeresultwindow.h')
-rw-r--r-- | src/mergeresultwindow.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mergeresultwindow.h b/src/mergeresultwindow.h index ed524a5..2b61e6f 100644 --- a/src/mergeresultwindow.h +++ b/src/mergeresultwindow.h @@ -110,7 +110,7 @@ public: const LineData* pLineDataB, int sizeB, const LineData* pLineDataC, int sizeC, const Diff3LineList* pDiff3LineList, - TotalDifftqStatus* pTotalDifftqStatus + TotalDiffStatus* pTotalDiffStatus ); void reset(); @@ -187,7 +187,7 @@ private: int m_sizeC; const Diff3LineList* m_pDiff3LineList; - TotalDifftqStatus* m_pTotalDifftqStatus; + TotalDiffStatus* m_pTotalDiffStatus; bool m_bPaintingAllowed; int m_delayedDrawTimer; |