diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd@luon.net> | 2013-10-25 21:21:07 +0200 |
| commit | e83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch) | |
| tree | c36a40d79a5ae7d2bbca7d240d0a6f664049b435 /src/generated/nm-marshal.h | |
| parent | 26283b4c9e5035574a6c168003e7f1da53a8f32a (diff) | |
| parent | a4256940da049f91bbbea5e53e469a59ea9c10f7 (diff) | |
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'src/generated/nm-marshal.h')
| -rw-r--r-- | src/generated/nm-marshal.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/generated/nm-marshal.h b/src/generated/nm-marshal.h index bc64ec5c..e93cee13 100644 --- a/src/generated/nm-marshal.h +++ b/src/generated/nm-marshal.h @@ -129,15 +129,7 @@ extern void _nm_marshal_VOID__STRING_STRING_STRING (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); -/* VOID:STRING,STRING,STRING,UINT (nm-marshal.list:17) */ -extern void _nm_marshal_VOID__STRING_STRING_STRING_UINT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -/* VOID:UINT,UINT (nm-marshal.list:18) */ +/* VOID:UINT,UINT (nm-marshal.list:17) */ extern void _nm_marshal_VOID__UINT_UINT (GClosure *closure, GValue *return_value, guint n_param_values, @@ -145,7 +137,7 @@ extern void _nm_marshal_VOID__UINT_UINT (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); -/* VOID:UINT,UINT,INT (nm-marshal.list:19) */ +/* VOID:UINT,UINT,INT (nm-marshal.list:18) */ extern void _nm_marshal_VOID__UINT_UINT_INT (GClosure *closure, GValue *return_value, guint n_param_values, @@ -153,7 +145,7 @@ extern void _nm_marshal_VOID__UINT_UINT_INT (GClosure *closure, gpointer invocation_hint, gpointer marshal_data); -/* VOID:UINT,UINT,UINT (nm-marshal.list:20) */ +/* VOID:UINT,UINT,UINT (nm-marshal.list:19) */ extern void _nm_marshal_VOID__UINT_UINT_UINT (GClosure *closure, GValue *return_value, guint n_param_values, |