Merge branch 'master' into experimental

Author: gallais

.gitignore

@@ -1,22 +1,23 @@
 # Keep this file in alphabetic order please!
-
-*~
-.*.swp
-*.agdai
+# Sort with the command `sort -uf`
 *.agda.el
-./_build/*
-.DS_Store
-*.lagda.el
+*.agdai
 *.hi
+*.lagda.el
 *.o
 *.tix
 *.vim
+*~
+.*.swp
+./_build/*
+.DS_Store
 dist
 dist-newstyle
 Everything.agda
 EverythingSafe.agda
 EverythingSafeGuardedness.agda
 EverythingSafeSizedTypes.agda
-html
+GenerateEverything
 Haskell
+html
 MAlonzo

.travis.yml

@@ -48,7 +48,7 @@ matrix:
              cd ../ &&
              git clone https://github.com/agda/agda &&
              cd agda &&
-             git checkout 5053aa9d2a901cfb4c54848e8455820f0183f1b3 &&
+             git checkout tags/v2.6.1 &&
              cabal install --only-dependencies --dry -v > $HOME/installplan.txt ;
           fi
 
@@ -152,10 +152,10 @@ matrix:
         - git remote add upstream https://[email protected]/agda/agda-stdlib.git &>/dev/null
         - git fetch upstream && git reset upstream/gh-pages
         - if [[ $TRAVIS_BRANCH = "master" ]]; then
-            git checkout HEAD -- v0.16/ v0.17/ v1.0/ v1.1/ v1.2/ experimental/ ;
+            git checkout HEAD -- v0.16/ v0.17/ v1.0/ v1.1/ v1.2/ v1.3/ experimental/ ;
           fi
         - if [[ $TRAVIS_BRANCH = "experimental" ]]; then
-            git checkout HEAD -- *.html v0.16/ v0.17/ v1.0/ v1.1/ v1.2/ ;
+            git checkout HEAD -- *.html v0.16/ v0.17/ v1.0/ v1.1/ v1.2/ v1.3/ ;
           fi
         - git add -f \*.html
         - git commit -m "Automatic HTML update via Travis"