diff options
| author | Paul Meng <baolmeng@gmail.com> | 2016-10-11 13:54:20 -0500 |
|---|---|---|
| committer | Paul Meng <baolmeng@gmail.com> | 2016-10-11 13:54:20 -0500 |
| commit | 3395c5c13cd61d98aec0d9806e3b9bc3d707968a (patch) | |
| tree | 0eadad9799862ec77d29f7abe03a46c300d80de8 /src/theory/sets/kinds | |
| parent | 773e7d27d606b71ff0f78e84efe1deef2653f016 (diff) | |
| parent | 5f415d4585134612bc24e9a823289fee35541a01 (diff) | |
Merge branch 'origin' of https://github.com/CVC4/CVC4.git
Conflicts:
src/options/quantifiers_options
Diffstat (limited to 'src/theory/sets/kinds')
0 files changed, 0 insertions, 0 deletions