Merge master.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/reel.h b/src/reel.h
index 0ad5ace2..00278a14 100644
--- a/src/reel.h
+++ b/src/reel.h
@@ -19,6 +19,8 @@
 
 #include <list>
 #include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <libxml++/libxml++.h>
 #include "types.h"
 
 namespace xmlpp {
@@ -59,7 +61,7 @@ public:
 
 	void write_to_cpl (xmlpp::Node *) const;
 
-	bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, std::list<std::string>& notes) const;
+	bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> notes) const;
 
 private:
 	boost::shared_ptr<const PictureAsset> _main_picture;