projects / model-checker.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3bc21e 3bab2ac)
fix
authorBrian Demsky <bdemsky@uci.edu>
Wed, 19 Sep 2012 07:35:54 +0000 (00:35 -0700)
committerBrian Demsky <bdemsky@uci.edu>
Wed, 19 Sep 2012 07:35:54 +0000 (00:35 -0700)
Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

Conflicts:
model.cc


Trivial merge
C++11 memory model checker