Changeset 8661caa for ipc.h

Timestamp:

2008-08-04T14:45:24Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

87f525e

Parents:

4ac647d (diff), 718e05f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merged in upstream r410.

Only conflict was the correction of jabber normalization which I had already done.

File:

• ipc.h (modified) (1 diff)

ipc.h

@@ -58 +58 @@
 
 char *ipc_master_save_state();
-void ipc_master_set_statefile( char *fn );
-int ipc_master_load_state();
+int ipc_master_load_state( char *statefile );
 int ipc_master_listen_socket();