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)
commit45206350b4022732229f8a48a3c7b08885e874a7
treeb7cdc3fa66e7ffe8a4160eb216b5038c4fd938f6
parentcaa1df880547acce2804221c8e6995170a5121eb
parent4bb070b43345c8617c6c627e2b9b24039affb6b7
merge
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

Conflicts:
config.h
model.cc
config.h
datarace.cc