diff options
author | Peter Wemm <peter@FreeBSD.org> | 2016-12-01 07:45:05 +0000 |
---|---|---|
committer | Peter Wemm <peter@FreeBSD.org> | 2016-12-01 07:45:05 +0000 |
commit | 608944fa5a78d7f517c9c73a7ded6c130cc97b83 (patch) | |
tree | 9dce7c56ce4cbd36bb5457661d50b23d30c3533c /subversion/libsvn_wc/wc-checks.h | |
parent | c94cceea9c2262c5b2ad5f215bb9a8ae48b02764 (diff) | |
download | src-608944fa5a78d7f517c9c73a7ded6c130cc97b83.tar.gz src-608944fa5a78d7f517c9c73a7ded6c130cc97b83.zip |
Import subversion-1.9.5.vendor/subversion/subversion-1.9.5
This includes a security fix for a component that we do not build, and
two potentially useful client side fixes for reintegrate merges and tree
conflict handling. See CHANGES for full details.
Notes
Notes:
svn path=/vendor/subversion/dist/; revision=309354
svn path=/vendor/subversion/subversion-1.9.5/; revision=309355; tag=vendor/subversion/subversion-1.9.5
Diffstat (limited to 'subversion/libsvn_wc/wc-checks.h')
-rw-r--r-- | subversion/libsvn_wc/wc-checks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/libsvn_wc/wc-checks.h b/subversion/libsvn_wc/wc-checks.h index 35f15336f3fd..09d43fb5356b 100644 --- a/subversion/libsvn_wc/wc-checks.h +++ b/subversion/libsvn_wc/wc-checks.h @@ -1,4 +1,4 @@ -/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.9.4/subversion/libsvn_wc/token-map.h. +/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.9.5/subversion/libsvn_wc/token-map.h. * Do not edit this file -- edit the source and rerun gen-make.py */ #define STMT_VERIFICATION_TRIGGERS 0 |