Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker
authorBrian Demsky <bdemsky@uci.edu>
Fri, 7 Sep 2012 01:56:39 +0000 (18:56 -0700)
committerBrian Demsky <bdemsky@uci.edu>
Fri, 7 Sep 2012 01:56:39 +0000 (18:56 -0700)
commitc5b57f3d98d1d14b4546995a0882753cf71a1c4b
treee748ee4b8491d0a6e1f6ea39c1bf5f16e62a0cfc
parent7c003db5218470054490a6777c97c6611b933a12
parent0accacf66b9f7bb4479205a0840f208dd8da6960
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

check in my stuff...

Conflicts:
model.cc
threads.h
model.cc