BUG: [ 1463137 ] MergeArgs.h is empty file?

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 580c621..5d1e0ed 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,12 @@ Src\Changes.txt
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-04-06 Kimmo
+ BUG: [ 1463137 ] MergeArgs.h is empty file?
+  Remove MergeArgs.h
+  Src: Merge.dsp
+  Src removed file: MergeArgs.h
+
 2006-04-05 Tim
  PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
   Src\editlib: asp.cpp

diff --git a/Src/Merge.dsp b/Src/Merge.dsp
index e55f64d..e754c29 100644 (file)
--- a/Src/Merge.dsp
+++ b/Src/Merge.dsp
@@ -1205,10 +1205,6 @@ SOURCE=.\Merge.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\MergeArgs.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\MergeDiffDetailView.h
 # End Source File
 # Begin Source File

diff --git a/Src/MergeArgs.h b/Src/MergeArgs.h
deleted file mode 100644 (file)
index e69de29..0000000