[fcm] 01/17: Merge tag 'upstream/2016.10.0' into debian/master

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository fcm.

commit e8b5d038f65300cbbe1ecbb65fdf36c244b27832
Merge: 4b2a4d4 5a2ea96
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Nov 1 00:43:46 2016 +0000

    Merge tag 'upstream/2016.10.0' into debian/master

 CHANGES.md                                         |  27 ++
 CONTRIBUTING.md                                    |   3 +-
 README.md                                          |   2 +
 doc/etc/fcm-version.js                             |   2 +-
 doc/installation/index.html                        |  12 +-
 doc/user_guide/annex_quick_ref_tree_conflicts.html |  21 +-
 lib/FCM/Admin/System.pm                            |  24 +-
 lib/FCM/System/CM/Prompt.pm                        |   4 +-
 lib/FCM/System/CM/ResolveConflicts.pm              |  26 +-
 lib/FCM/System/Make/Share/Dest.pm                  |  14 +-
 t/fcm-add-trac-env/00-basic.t                      |  16 +-
 t/fcm-add/test_header                              | 233 +-----------------
 t/fcm-branch-create/00-simple.t                    |   4 +-
 t/fcm-branch-create/test_header                    | 233 +-----------------
 t/fcm-branch-delete/test_header                    | 233 +-----------------
 t/fcm-branch-diff/00-simple.t                      | 166 +++++++++----
 t/fcm-branch-diff/test_header                      |  37 +--
 t/fcm-branch-info/00-simple.t                      |   5 +-
 t/fcm-branch-info/test_header                      |  37 +--
 t/fcm-branch-list/00-simple.t                      |   4 +-
 t/fcm-branch-list/test_header                      |  37 +--
 t/fcm-commit/00-simple.t                           |  11 +-
 t/fcm-commit/01-subtree.t                          |  11 +-
 t/fcm-commit/test_header                           |  37 +--
 t/fcm-conflicts/11-tree-edit-replace.t             |  79 ++++++
 t/fcm-conflicts/test_header                        |  39 +--
 t/fcm-diff/00-simple.t                             |   7 +-
 t/fcm-diff/test_header                             |  37 +--
 t/fcm-loc-layout/test_header                       |  37 +--
 t/fcm-make/00-build-basic.t                        |   3 +-
 t/fcm-make/05-build-c-cxx-basic.t                  |   3 +-
 t/fcm-make/12-build-class-prop.t                   |   3 +-
 t/fcm-make/23-build-omp.t                          |   6 +-
 t/fcm-make/41-ctx-name.t                           |  27 +-
 t/fcm-make/42-make-mirror-make2.t                  |  19 +-
 t/fcm-make/43-ctx-name-inherit.t                   |   8 +-
 t/fcm-make/44-ctx-name-inherit-compat.t            |   7 +-
 t/fcm-make/46-archive-mode.t                       |  20 +-
 t/fcm-merge/00-simple.t                            |  22 +-
 t/fcm-merge/01-complex.t                           | 168 +++++++------
 t/fcm-merge/test_header                            | 271 +--------------------
 t/fcm-status/test_header                           |  37 +--
 t/fcm-switch/test_header                           | 233 +-----------------
 t/fcm-update/00-simple.t                           |   2 +-
 t/fcm-update/01-subtree.t                          |   2 +-
 t/fcm-update/test_header                           | 233 +-----------------
 .../test_header => lib/bash/svn_test_header}       |  63 +++--
 t/lib/bash/test_header                             |  39 ++-
 t/svn-hooks/03-post-commit-bg.t                    |   2 +
 49 files changed, 769 insertions(+), 1797 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fcm.git