summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOri Bernstein <orib@google.com>2012-06-07 13:59:50 -0400
committerOri Bernstein <orib@google.com>2012-06-07 13:59:50 -0400
commitb0bb18ea0c30216319410faf536cb09bc0f31e99 (patch)
tree73d8feee0faf6645d6f28269dad17c21f11c2e3f /Makefile
parent7f764bf844fa3630cbc8e2740fa2a1c8439c4067 (diff)
parentcd759a0aeddace73edb206608e24c8410b753273 (diff)
downloadmc-b0bb18ea0c30216319410faf536cb09bc0f31e99.tar.gz
Merge branch 'master' of git+ssh://mimir.eigenstate.org/git/ori/mc2
Conflicts: 8/reduce.c
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions