Merge "master" into "psppsheet" to obtain bug fixes from "master".

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

diff --git a/src/ui/gui/marshaller-list b/src/ui/gui/marshaller-list
index 3cf5a9c87e92cf9aafead3167fd23b1086a59560..f3e4042b1c0cb324b45c457bce389e75f9d6f854 100644 (file)
--- a/src/ui/gui/marshaller-list
+++ b/src/ui/gui/marshaller-list
@@ -2,8 +2,10 @@
 
 BOOLEAN:BOOLEAN
 BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN
+BOOLEAN:BOXED
 BOOLEAN:ENUM
 BOOLEAN:ENUM,INT
+BOOLEAN:INT
 BOOLEAN:BOXED,BOXED
 BOOLEAN:BOXED,POINTER
 BOOLEAN:OBJECT