moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-11-26 11:12:19 -05:00
Code Issues Releases Wiki Activity

bad conflict resolve, missing header for udiff

Browse Source
This commit is contained in:
berkeviktor@aol.com 2010-09-28 16:38:22 +02:00
parent 1fea687f82
commit 3ca6f5dda9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xchat-wdk.patch
View File

@ -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);