From: Junio C Hamano Date: Tue, 17 Jan 2017 22:49:25 +0000 (-0800) Subject: Merge branch 'bb/unicode-9.0' into maint X-Git-Tag: v2.11.1~65 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9d1e8ddc739ee11b9077899eee70a8c5e1c30235?hp=-c Merge branch 'bb/unicode-9.0' into maint The character width table has been updated to match Unicode 9.0 * bb/unicode-9.0: unicode_width.h: update the width tables to Unicode 9.0 update_unicode.sh: remove the plane filter update_unicode.sh: automatically download newer definition files update_unicode.sh: pin the uniset repo to a known good commit update_unicode.sh: remove an unnecessary subshell level update_unicode.sh: move it into contrib/update-unicode --- 9d1e8ddc739ee11b9077899eee70a8c5e1c30235 diff --combined .gitignore index 05cb58a3d4,203703a492..6722f78f9a --- a/.gitignore +++ b/.gitignore @@@ -155,7 -155,6 +155,7 @@@ /git-status /git-stripspace /git-submodule +/git-submodule--helper /git-svn /git-symbolic-ref /git-tag @@@ -172,13 -171,42 +172,13 @@@ /git-verify-tag /git-web--browse /git-whatchanged +/git-worktree /git-write-tree /git-core-*/?* /gitweb/GITWEB-BUILD-OPTIONS /gitweb/gitweb.cgi /gitweb/static/gitweb.js /gitweb/static/gitweb.min.* -/test-chmtime -/test-ctype -/test-config -/test-date -/test-delta -/test-dump-cache-tree -/test-dump-split-index -/test-scrap-cache-tree -/test-genrandom -/test-hashmap -/test-index-version -/test-line-buffer -/test-match-trees -/test-mergesort -/test-mktemp -/test-parse-options -/test-path-utils -/test-prio-queue -/test-read-cache -/test-regex -/test-revision-walking -/test-run-command -/test-sha1 -/test-sha1-array -/test-sigchain -/test-string-list -/test-subprocess -/test-svn-fe -/test-urlmatch-normalization -/test-wildmatch /common-cmds.h *.tar.gz *.dsc @@@ -203,7 -231,6 +203,6 @@@ /config.mak.autogen /config.mak.append /configure - /unicode /tags /TAGS /cscope*