merge the 2 common header files; specific includes to be pulled out as

separate commits.

ok oga@

1 files changed, 1 insertions, 2 deletions

diff --git a/conf.c b/conf.c
index cc3a03e..761df11 100644
--- a/conf.c
+++ b/conf.c
@@ -15,10 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: conf.c,v 1.73 2009/12/11 17:51:42 oga Exp $
+ * $Id: conf.c,v 1.74 2009/12/15 03:24:36 okan Exp $
  */
 
-#include "headers.h"
 #include "calmwm.h"
 
 #ifndef timespeccmp