Merge branch 'master' of git://ozlabs.org/~paulus/gitk

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 963e1c58b9049f1b9ee94537171bd3c6cd21680f..cfa6e2220ffd0461ce3293911c86366f6ccb1b05 100644 (file)
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -20,13 +20,9 @@
  *
  */
 
-#include <limits.h>
-#include <assert.h>
 #include "xinclude.h"
 
 
-
-
 long xdl_bogosqrt(long n) {
        long i;