cscvs to tla changeset 77

[onak.git] / merge.c

diff --git a/merge.c b/merge.c
index 3e8e8fcf7eb772ff8ca0b7cd8c1289c4d7ddb112..6ed0a2d139a40af796251862a7cb624f4fc6deeb 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -4,11 +4,14 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: merge.c,v 1.10 2003/06/04 20:57:11 noodles Exp $
  */
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "decodekey.h"
 #include "keydb.h"