Merge branch 'norris'
authorBrian Norris <banorris@uci.edu>
Tue, 25 Sep 2012 19:19:44 +0000 (12:19 -0700)
committerBrian Norris <banorris@uci.edu>
Tue, 25 Sep 2012 19:19:44 +0000 (12:19 -0700)
commit20d006a8c581117c6636e835cdbe36dac5d6ef93
treefa2e5a79c8875bbb5a6ea768c202d8c4ef72a4c9
parent1be4d40117ac7eb13715f6384c7dfdd390246aa7
parentf71cd7c31df98cfc814254da887de9a30c53b31e
Merge branch 'norris'
model.cc
model.h