bb3205e480
* make compile under gcc3.2; * per-hunk ignore whitespace implemented; * lines inserted for display purposes now has a cross-hatch pattern to make it more obvious; * minor key binding changes for better interaction with most window managers. From: Dan Weeks <danimal@danimal.org>
11 lines
298 B
Plaintext
11 lines
298 B
Plaintext
--- builderUnmerge.cpp.orig Mon Sep 30 10:55:56 2002
|
|
+++ builderUnmerge.cpp Mon Sep 30 10:56:37 2002
|
|
@@ -73,6 +73,7 @@ public:
|
|
const XxFln f3n2
|
|
);
|
|
|
|
+ virtual ~XxConflictFormatError() throw() { }
|
|
};
|
|
|
|
//------------------------------------------------------------------------------
|