fix merge
authorBrian Demsky <bdemsky@uci.edu>
Thu, 20 Sep 2012 00:42:13 +0000 (17:42 -0700)
committerBrian Demsky <bdemsky@uci.edu>
Thu, 20 Sep 2012 00:42:13 +0000 (17:42 -0700)
commitdb607bcf0c5a0608e2f8e3364ec1c062a48bee03
tree00e5a21247bf2552e01966e752701b9124c61952
parent0217e321ae9bb43b3e629fdb400d6f1c41fb75f0
fix merge
model.cc