Merge branch 'norris'
authorBrian Norris <banorris@uci.edu>
Fri, 14 Sep 2012 18:25:59 +0000 (11:25 -0700)
committerBrian Norris <banorris@uci.edu>
Fri, 14 Sep 2012 18:25:59 +0000 (11:25 -0700)
commit202074f941d19cef894068e7f79d76b2df598f4b
treee2e81deac1fdcae1c74925614a24bb7dc2c4d1c3
parentf7a6ea5bf658115849fcc5b8a06a3f8c5a629656
parent65a0c0d8d991b2775d15934b07cb51b422a5d20b
Merge branch 'norris'
model.cc
model.h