Merge branch 'tb/unicode-7.0-display-width' into next
commit111b246cb7af6a070008ef11e82a35fe4d346f7c
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:39:58 +0000 (20 13:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Jun 2014 20:39:58 +0000 (20 13:39 -0700)
tree31104b8f87e2215afe9fadee605b25774972ece2
parentd28602747f50f64fab18eafa87d6897e795d0b3f
parenta67c821dedf04683d65f2909c193617ca227cc02
Merge branch 'tb/unicode-7.0-display-width' into next

* tb/unicode-7.0-display-width:
  Update of unicode_width.h to Unicode Version 7.0