diff options
| author | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-09-28 16:38:22 +0200 |
|---|---|---|
| committer | berkeviktor@aol.com <berkeviktor@aol.com> | 2010-09-28 16:38:22 +0200 |
| commit | 3ca6f5dda9651837235ff30aeda056af036099f1 (patch) | |
| tree | bd07b375f7fe849eb7c047877cafb2583e0c2505 | |
| parent | 1fea687f824468138be992af4cd8d7d31f97dd1f (diff) | |
bad conflict resolve, missing header for udiff
| -rw-r--r-- | xchat-wdk.patch | 2 |
1 files changed, 2 insertions, 0 deletions
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 <stdlib.h> #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); |