Merge latest Disobedience changes

[disorder] / lib / regsub.c

diff --git a/lib/regsub.c b/lib/regsub.c
index bad6034560eb4669ab3438a35fca3052354aee0e..bb90f431ec851576209d01b9c2bb9b84e247747a 100644 (file)
--- a/lib/regsub.c
+++ b/lib/regsub.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2007, 20008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,10 +18,8 @@
  * USA
  */
 
-#include <config.h>
-#include "types.h"
+#include "common.h"
 
-#include <string.h>
 #include <pcre.h>
 
 #include "regsub.h"
@@ -163,4 +161,3 @@ c-basic-offset:2
 comment-column:40
 End:
 */
-/* arch-tag:69b3b3dafcbaa25619a77a33c44ad699 */