projects
/
cvc5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1cadb3c
e347f43
)
Merge branch '1.3.x'
author
Morgan Deters
<mdeters@cs.nyu.edu>
Wed, 26 Mar 2014 22:35:33 +0000
(18:35 -0400)
committer
Morgan Deters
<mdeters@cs.nyu.edu>
Wed, 26 Mar 2014 22:35:33 +0000
(18:35 -0400)
Conflicts:
src/theory/arith/normal_form.cpp
1
2
src/theory/logic_info.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/theory/logic_info.cpp
Simple merge