diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-05 00:36:37 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-12-05 00:36:37 +0900 |
| commit | 0d786985a368d88e8ab4e45fc3607efc5e773732 (patch) | |
| tree | 5dfc8ec0e27ac3c23b9dc2eb097018971c28fd6b /gtk/gtkmarshalers.list | |
| parent | 1d3961b34258a7a8c97ca12993220554369fccb1 (diff) | |
| parent | cd76b057e9693b6919f4ccbe40ce205efc8d3caf (diff) | |
| download | gtk+-0d786985a368d88e8ab4e45fc3607efc5e773732.tar.gz | |
Merge branch 'master' into treeview-refactor
Conflicts:
gtk/gtkmarshalers.list
tests/Makefile.am
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 9279037c7c..fa60a7c91d 100644 --- a/gtk/gtkmarshalers.list +++ b/gtk/gtkmarshalers.list @@ -70,6 +70,7 @@ VOID:ENUM,INT VOID:ENUM,INT,BOOLEAN VOID:ENUM,BOXED VOID:ENUM,STRING +VOID:FLAGS VOID:INT VOID:INT,BOOLEAN VOID:INT,INT |