Mercurial > hg > easyhg-kdiff3

changeset 29:e0bb6c85203a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Line endings corrected
author joachim99
date Sat, 11 Oct 2003 12:52:28 +0000
parents 675b2ed580b2
children 3d2965e0fb9c
files kdiff3/src/merger.h
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/kdiff3/src/merger.h	Sat Oct 11 12:50:38 2003 +0000
+++ b/kdiff3/src/merger.h	Sat Oct 11 12:52:28 2003 +0000
@@ -17,9 +17,11 @@
 
 /***************************************************************************
  * $Log$
+ * Revision 1.2  2003/10/11 12:52:28  joachim99
+ * Line endings corrected
+ *
  * Revision 1.1  2003/10/06 18:38:48  joachim99
  * KDiff3 version 0.9.70
- *                                                                   *
  ***************************************************************************/
 
 #ifndef MERGER_H