Merge branch 'master' into next

This commit is contained in:
Alexandre Duret-Lutz 2020-07-21 08:28:13 +02:00
commit 1a0c8a44ba
4 changed files with 11 additions and 9 deletions

4
NEWS
View file

@ -1,4 +1,4 @@
New in spot 2.9.1.dev (not yet released)
New in spot 2.9.2.dev (not yet released)
Build:
@ -45,6 +45,8 @@ New in spot 2.9.1.dev (not yet released)
file. With this refactoring, we can retrieve both a kripke or a
kripkecube from a PINS file.
New in spot 2.9.2 (2020-07-21)
Bugs fixed:
- ltlcross --csv=... --product=N with N>0 could output spurious

View file

@ -457,12 +457,12 @@ autproc_runner::round_automaton(spot::const_twa_graph_ptr aut, unsigned serial)
filename_automaton.new_round(aut, serial);
}
std::atomic<bool> timed_out = false;
std::atomic<bool> timed_out{false};
unsigned timeout_count = 0;
static unsigned timeout = 0;
#if ENABLE_TIMEOUT
static std::atomic<int> alarm_on = 0;
static std::atomic<int> alarm_on{0};
static int child_pid = -1;
static void

View file

@ -21,7 +21,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ([2.63])
AC_INIT([spot], [2.9.1.dev], [spot@lrde.epita.fr])
AC_INIT([spot], [2.9.2.dev], [spot@lrde.epita.fr])
AC_CONFIG_AUX_DIR([tools])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 gnu tar-ustar color-tests parallel-tests])

View file

@ -1,11 +1,11 @@
#+OPTIONS: H:2 num:nil toc:t html-postamble:nil ^:nil
#+EMAIL: spot@lrde.epita.fr
#+HTML_LINK_HOME: index.html
#+MACRO: SPOTVERSION 2.9.1
#+MACRO: LASTRELEASE 2.9.1
#+MACRO: LASTTARBALL [[http://www.lrde.epita.fr/dload/spot/spot-2.9.1.tar.gz][=spot-2.9.1.tar.gz=]]
#+MACRO: LASTNEWS [[https://gitlab.lrde.epita.fr/spot/spot/blob/spot-2-9-1/NEWS][summary of the changes]]
#+MACRO: LASTDATE 2020-07-15
#+MACRO: SPOTVERSION 2.9.2
#+MACRO: LASTRELEASE 2.9.2
#+MACRO: LASTTARBALL [[http://www.lrde.epita.fr/dload/spot/spot-2.9.2.tar.gz][=spot-2.9.2.tar.gz=]]
#+MACRO: LASTNEWS [[https://gitlab.lrde.epita.fr/spot/spot/blob/spot-2-9-2/NEWS][summary of the changes]]
#+MACRO: LASTDATE 2020-07-21
#+ATTR_HTML: :id spotlogo
[[file:spot2.svg]]