Programming Languages Research Group: Git - cdsspec-compiler.git/commit

projects / cdsspec-compiler.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 59eb730 07d9e34)

author	Brian Demsky <bdemsky@uci.edu>
	Mon, 8 Oct 2012 08:21:35 +0000 (01:21 -0700)
committer	Brian Demsky <bdemsky@uci.edu>
	Mon, 8 Oct 2012 08:21:35 +0000 (01:21 -0700)
commit	b8b39c87557325a384faa45d0cae56a6f71f52b1
tree	72ff206ee22eb6b8bf7c54e4540a46ca3eef3ce2	tree \| snapshot
parent	59eb730e1d19a0825008c40eb521bfc5c29df5f9	commit \| diff
parent	07d9e344693c6d2b85f821447be80deaee118b65	commit \| diff

merge massive speedup with release sequence support...

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

Conflicts:
schedule.cc
schedule.h

action.cc	diff1 \|	diff2 \|	blob \| history
model.cc	diff1 \|	diff2 \|	blob \| history
model.h	diff1 \|	diff2 \|	blob \| history
nodestack.cc	diff1 \|	diff2 \|	blob \| history
nodestack.h	diff1 \|	diff2 \|	blob \| history
schedule.cc	diff1 \|	diff2 \|	blob \| history
schedule.h	diff1 \|	diff2 \|	blob \| history

This is the public repository for the CDSSpec specification compiler.