Merge branch 'explain-assert' into master

diff --cc lib/gamnit/dynamic_resolution.nit
Simple merge

diff --cc lib/gamnit/flat/flat_core.nit
Simple merge

diff --cc src/compiler/abstract_compiler.nit
index 1a1bb07,a21456d..08cdb07
--- 1/src/compiler/abstract_compiler.nit
--- 2/src/compiler/abstract_compiler.nit
+++ b/src/compiler/abstract_compiler.nit
@@@ -24,7 -24,7 +24,8 @@@ import c_tool
  private import annotation
  import mixin
  import counter
 +import pkgconfig
+ private import explain_assert_api
  
  # Add compiling options
  redef class ToolContext

diff --cc src/interpreter/naive_interpreter.nit
Simple merge