bad conflict resolve, missing header for udiff
This commit is contained in:
parent
1fea687f82
commit
3ca6f5dda9
|
@ -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 <stdlib.h>
|
||||||
|
|
||||||
#include "fe-gtk.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
|
+++ xchat-wdk/src/fe-gtk/servlistgui.c 2010-09-25 00:29:23 +0000
|
||||||
@@ -1782,7 +1823,7 @@
|
@@ -1782,7 +1823,7 @@
|
||||||
gtk_container_add (GTK_CONTAINER (hbox), checkbutton_fav);
|
gtk_container_add (GTK_CONTAINER (hbox), checkbutton_fav);
|
||||||
|
|
Loading…
Reference in New Issue