Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/cfd
authorMark Wooding <mdw@distorted.org.uk>
Sun, 29 May 2016 15:18:40 +0000 (16:18 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 29 May 2016 15:18:40 +0000 (16:18 +0100)
* 'master' of git.distorted.org.uk:~mdw/publish/public-git/cfd:
  Release 1.3.11.
  debian/control: Fix build-depends.
  debian/source/format: Apparently there should be one of these.
  debian/control: Fix my email address.
  Makefile.am: We no longer need to make the COPYING link on distribution.
  .gitignore: COPYING is now a symbolic link, made at setup time.
  Reinstate erroneously deleted `*.tex' and `*.texi' files.

1  2 
debian/control

diff --cc debian/control
Simple merge