From: Brian Demsky <bdemsky@uci.edu>
Date: Mon, 25 Feb 2013 07:25:59 +0000 (-0800)
Subject: fix conflicts
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=dc9c89654982c64264dfee7b1ea23e9a5e88e18e

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

Conflicts:
	schedule.cc
---

dc9c89654982c64264dfee7b1ea23e9a5e88e18e