pidgin/pidgin
Clone
Summary
Browse
Changes
Graph
Merge with a fair number of conflicts. Nothing too crazy.
2014-01-20, Mark Doliner
77664079d0f0
Merge with a fair number of conflicts. Nothing too crazy.
I didn't merge a lot of changes from 07e827917960
libpurple/protocols/gg/gg.c I think maybe that code has either been
removed or changed significantly in main.
#ifndef _PURPLE_CLIENT_H_INCLUDED_
#define _PURPLE_CLIENT_H_INCLUDED_
#include
<glib.h>
#include
<glib-object.h>
#include
"purple-client-bindings.h"
G_BEGIN_DECLS
void
purple_init
(
void
);
G_END_DECLS
#endif