Merge branch 'master' of git://repo.or.cz/git-gui into maint

diff --git a/unpack-trees.c b/unpack-trees.c
index b8689ebc86bb69c21fd650572c55a4c3d246a183..2e2232cbb07e61de3be74302fba67142a58a857b 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1,5 +1,3 @@
-#include <signal.h>
-#include <sys/time.h>
 #include "cache.h"
 #include "dir.h"
 #include "tree.h"