Skip to content
Snippets Groups Projects
Commit cc7e4db0 authored by Mikaël Mayer's avatar Mikaël Mayer
Browse files

Merge branch 'master' into develop 

# Conflicts:
#	src/main/scala/leon/purescala/ScopeSimplifier.scala
#	src/main/scala/leon/synthesis/Solution.scala
parents 2e8ec76a 3068e6ec
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1491 additions and 99 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment