Merge branch 'master' into next

Conflicts:
	NEWS
	configure.ac
	src/kripketest/bad_parsing.test
	src/ltltest/reduccmp.test
	src/neverparse/neverclaimscan.ll
	src/tgba/futurecondcol.cc
	src/tgba/tgbasafracomplement.cc
	src/tgbaalgos/hoa.cc
	src/tgbaalgos/ltl2tgba_fm.cc
	src/tgbatest/neverclaimread.test
	src/tgbatest/readsave.test

HACKING

@@ -3,6 +3,14 @@ Bootstraping from the GIT repository
 
 (If you are building from a tarball, skip this section.)
 
+Spot's gitlab page is at
+
+  https://gitlab.lrde.epita.fr/spot/spot
+
+The GIT repository can be cloned with
+
+  git clone https://gitlab.lrde.epita.fr/spot/spot.git
+
 Some files in SPOT's source tree are generated.  They are distributed
 so that users do not need to tools to rebuild them, but we don't keep
 all of them under GIT because it can generate lots of changes or

NEWS

@@ -173,7 +173,11 @@ New in spot 1.99a (not yet released)
     - The unused implementation of state-based alternating Büchi automata
       has been removed.
 
-New in spot 1.2.5a (not yet released)
+New in spot 1.2.6a (not yet released)
+
+  Nothing yet.
+
+New in spot 1.2.6 (2014-12-06)
 
   * New features:
 
@@ -195,6 +199,7 @@ New in spot 1.2.5a (not yet released)
       state labels.
     - the acceptance specification in the HOA format output have been
       adjusted to match recent changes in the format specifications.
+    - atomic propositions are correctly escaped in the HOA output.
     - the build rules for documentation have been made compatible with
       version 8.0 of Org-mode.  (This was only a problem if you build
       from the git repository, or if you want to edit the
@@ -210,6 +215,7 @@ New in spot 1.2.5a (not yet released)
       libstd++ has also been fixed.
     - all parsers would report wrong line numbers while processing
       files with DOS style newlines.
+    - add support for SWIG 3.0.
 
 New in spot 1.2.5 (2014-08-21)
 

doc/org/tools.org

@@ -1,4 +1,4 @@
-#+TITLE: Command-line tools installed by Spot 1.2.5
+#+TITLE: Command-line tools installed by Spot 1.2.6
 #+EMAIL spot@lrde.epita.fr
 #+OPTIONS: H:2 num:nil toc:t