diff options
author | Matthias Clasen <mclasen@redhat.com> | 2010-05-25 18:38:44 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2010-05-25 18:38:44 -0400 |
commit | bd4609b14042a91646cd9057764eecfbc6faf42b (patch) | |
tree | 8721405d2b45a998f87cccc672b4070780907fb8 /gtk/gtkmarshalers.list | |
parent | a538f639b69a39d7bb85b39af2dfd296d28fc0aa (diff) | |
download | gtk+-bd4609b14042a91646cd9057764eecfbc6faf42b.tar.gz |
Merge the xi2-for-master branch
Diffstat (limited to 'gtk/gtkmarshalers.list')
-rw-r--r-- | gtk/gtkmarshalers.list | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list index 77873cb022..22af46d610 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -83,6 +83,7 @@ VOID:OBJECT,INT,OBJECT VOID:OBJECT,INT,INT VOID:OBJECT,INT,INT,BOXED,UINT,UINT VOID:OBJECT,OBJECT +VOID:OBJECT,POINTER VOID:OBJECT,STRING VOID:OBJECT,STRING,STRING VOID:OBJECT,UINT |