Merge branch 'master' into js/merge-base

diff --git a/object.h b/object.h
index e0125e154fd970209d30138858f31ef2017651ac..d8a76ea93552e0896d4d0c1dfbf60fa01436e6f5 100644 (file)
--- a/object.h
+++ b/object.h
@@ -84,4 +84,6 @@ int object_list_contains(struct object_list *list, struct object *obj);
 /* Object array handling .. */
 void add_object_array(struct object *obj, const char *name, struct object_array *array);
 
+void clear_object_marks(unsigned);
+
 #endif /* OBJECT_H */