fix conflicts
authorBrian Demsky <bdemsky@uci.edu>
Mon, 25 Feb 2013 07:25:59 +0000 (23:25 -0800)
committerBrian Demsky <bdemsky@uci.edu>
Mon, 25 Feb 2013 07:25:59 +0000 (23:25 -0800)
commitdc9c89654982c64264dfee7b1ea23e9a5e88e18e
tree2d16d6a33dbef0a5cd45c0ed227eac658c6b43fb
parent0997f5bf1b28a79066ed4abfed57f14419ee44d3
parentff1d424096506e2fe30b15286afb84a95cd05703
fix conflicts
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

Conflicts:
schedule.cc
model.cc
schedule.cc