diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2012-10-19 11:35:22 -0500 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2012-10-19 11:35:22 -0500 |
| commit | 1dfd0e8c9b95e44f94bf6079e7472ccea55c9608 (patch) | |
| tree | 392619dfd790bda5ea040729f0586362ec5bda5d /gtk/gtkmarshalers.list | |
| parent | 4de4d6a6a7e47c6fba916551116d663e7c7ccb68 (diff) | |
| parent | f0a211a1df968393ff07e43672be64f854179c5b (diff) | |
| download | gtk+-1dfd0e8c9b95e44f94bf6079e7472ccea55c9608.tar.gz | |
Merge master into places-sidebar to keep up with development
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 9376995146..d826fc71cf 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -69,6 +69,7 @@ VOID:ENUM,FLOAT VOID:ENUM,FLOAT,BOOLEAN VOID:ENUM,INT VOID:ENUM,INT,BOOLEAN +VOID:ENUM,INT,INT VOID:ENUM,BOXED VOID:ENUM,STRING VOID:FLAGS |