diff options
| author | Ori Bernstein <orib@google.com> | 2012-06-07 13:59:50 -0400 |
|---|---|---|
| committer | Ori Bernstein <orib@google.com> | 2012-06-07 13:59:50 -0400 |
| commit | 635c4e644072d6b92895a60eee9bbcfb15a451d7 (patch) | |
| tree | 73d8feee0faf6645d6f28269dad17c21f11c2e3f /Makefile | |
| parent | 5a54b0481cbbba53ff8e2edf98de9d672f3ef5b3 (diff) | |
| parent | a0df0dc05e6f90662ad2144761b3124b71e8cd1e (diff) | |
| download | mc-635c4e644072d6b92895a60eee9bbcfb15a451d7.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