Commit 750aaa32 authored by Davis King's avatar Davis King

merged

parents f8786b4f f7974018
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
namespace dlib namespace dlib
{ {
class unserialize : public std::iostream class unserialize : public std::istream
{ {
/*! /*!
WHAT THIS OBJECT REPRESENTS WHAT THIS OBJECT REPRESENTS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment