From: Brian Demsky <bdemsky@uci.edu>
Date: Fri, 7 Sep 2012 01:56:39 +0000 (-0700)
Subject: Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker
X-Git-Tag: pldi2013~235
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=c5b57f3d98d1d14b4546995a0882753cf71a1c4b;hp=c5b57f3d98d1d14b4546995a0882753cf71a1c4b

Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

check in my stuff...

Conflicts:
	model.cc
	threads.h
---