From: Brian Demsky <bdemsky@uci.edu>
Date: Thu, 15 Nov 2012 02:15:04 +0000 (-0800)
Subject: merge
X-Git-Tag: oopsla2013~539^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=45206350b4022732229f8a48a3c7b08885e874a7;hp=45206350b4022732229f8a48a3c7b08885e874a7

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

Conflicts:
	config.h
	model.cc
---