Merging with master
authorHamed Gorjiara <hgorjiar@uci.edu>
Thu, 2 Nov 2017 00:58:49 +0000 (17:58 -0700)
committerHamed Gorjiara <hgorjiar@uci.edu>
Thu, 2 Nov 2017 00:58:49 +0000 (17:58 -0700)
commita81fa2318fde9ebaa3a0cf1604ab23ed85c3a9a7
tree3d061ec685e561c6200f969acc11faf870749c50
parent09f6a69ae4cc6796fe901ae9d22e0cf62a5ea2fb
parentee7d71e66d8d472895d9f742a40ea9bb477a8f32
Merging with master
src/Serialize/serializer.cc