From 3ca6f5dda9651837235ff30aeda056af036099f1 Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Tue, 28 Sep 2010 16:38:22 +0200 Subject: [PATCH] bad conflict resolve, missing header for udiff --- xchat-wdk.patch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 3ff5a038..68320ab0 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -1164,6 +1164,8 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/rawlog.c xchat-wdk/src/f #include #include "fe-gtk.h" +diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/servlistgui.c xchat-wdk/src/fe-gtk/servlistgui.c +--- xchat-wdk.orig/src/fe-gtk/servlistgui.c 2010-08-07 07:14:45 +0000 +++ xchat-wdk/src/fe-gtk/servlistgui.c 2010-09-25 00:29:23 +0000 @@ -1782,7 +1823,7 @@ gtk_container_add (GTK_CONTAINER (hbox), checkbutton_fav);