merge
authorBrian Demsky <bdemsky@uci.edu>
Thu, 15 Nov 2012 02:15:04 +0000 (18:15 -0800)
committerBrian Demsky <bdemsky@uci.edu>
Thu, 15 Nov 2012 02:15:04 +0000 (18:15 -0800)
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

Conflicts:
config.h
model.cc


No differences found