Merge 'master' into 'psppsheet'.

[pspp] / src / ui / gui / marshaller-list

diff --git a/src/ui/gui/marshaller-list b/src/ui/gui/marshaller-list
index cb7c9113afe67df6cb514b702a2db820f5231603..f3e4042b1c0cb324b45c457bce389e75f9d6f854 100644 (file)
--- a/src/ui/gui/marshaller-list
+++ b/src/ui/gui/marshaller-list
@@ -1,13 +1,20 @@
 #List of custom marshallers used by psppire
 
 BOOLEAN:BOOLEAN
+BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN
+BOOLEAN:BOXED
 BOOLEAN:ENUM
+BOOLEAN:ENUM,INT
+BOOLEAN:INT
+BOOLEAN:BOXED,BOXED
 BOOLEAN:BOXED,POINTER
+BOOLEAN:OBJECT
 BOOLEAN:VOID
 VOID:BOXED,BOXED
+VOID:BOXED,OBJECT
 VOID:INT,INT
 VOID:INT,LONG
-VOID:INT,INT,INT
 VOID:INT,INT,INT,INT
 VOID:INT,POINTER
 VOID:OBJECT,OBJECT
+VOID:POINTER,INT,INT