Merging with branch master
authorHamed <hamed.gorjiara@gmail.com>
Fri, 8 Sep 2017 21:15:09 +0000 (14:15 -0700)
committerHamed <hamed.gorjiara@gmail.com>
Fri, 8 Sep 2017 21:15:09 +0000 (14:15 -0700)
commit4901eaf03e64e4ed21f1ec0d786b75b5aa29283c
tree6ded8269b6a0f08c3687cd7bf3214aae62dd8266
parent1615693b51360f548146ef90fd603ca6d1f08ee4
parent99d1bc0007e1ec7899cc6e60c98bbfb337c94731
Merging with branch master
src/Makefile
src/Serialize/deserializer.cc
src/Test/buildconstraintstest.cc
src/csolver.cc