Merge branch master (Spot 1.2.5) into next.
* src/bin/dstar2tgba.cc, src/bin/ltlcross.cc, src/bin/randltl.cc, src/ltltest/reduccmp.test, src/neverparse/neverclaimparse.yy, src/tgbatest/ltl2ta.test, src/tgbatest/ltl2tgba.cc, src/tgbatest/ltlcross.test, src/tgbatest/neverclaimread.test, wrap/python/ajax/ltl2tgba.html: Fix conflicts.
This commit is contained in:
commit
700cf88b06
30 changed files with 1029 additions and 163 deletions
|
|
@ -98,6 +98,7 @@ namespace std {
|
|||
#include "ltlvisit/tostring.hh"
|
||||
#include "ltlvisit/tunabbrev.hh"
|
||||
#include "ltlvisit/apcollect.hh"
|
||||
#include "ltlvisit/lbt.hh"
|
||||
|
||||
#include "tgba/bddprint.hh"
|
||||
#include "tgba/fwd.hh"
|
||||
|
|
@ -203,6 +204,7 @@ using namespace spot;
|
|||
%include "ltlvisit/tostring.hh"
|
||||
%include "ltlvisit/tunabbrev.hh"
|
||||
%include "ltlvisit/apcollect.hh"
|
||||
%include "ltlvisit/lbt.hh"
|
||||
|
||||
%feature("new") spot::emptiness_check::check;
|
||||
%feature("new") spot::emptiness_check_instantiator::construct;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue