Merge branch 'demsky'
authorBrian Norris <banorris@uci.edu>
Wed, 12 Sep 2012 00:52:02 +0000 (17:52 -0700)
committerBrian Norris <banorris@uci.edu>
Wed, 12 Sep 2012 00:56:14 +0000 (17:56 -0700)
commit50b95c3747f4fe79b2ab1a1a6fc303224e16e418
treeace2e369c9af9f75bd21aacde550b049dd9b1b60
parentf2a014110185c734180545ffc1dc2f0dcd30fd0c
parent7c6c6a9bd044f8986ec17641cb8ea5f4e1aae345
Merge branch 'demsky'

Branch cleaned up by Brian Norris
model.cc
model.h