Merge gitk to pick up emergency build fix
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2019 21:59:18 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Sep 2019 21:59:18 +0000 (14:59 -0700)
commit8a3a6817e24ae1cf1fd08fb90b4a99e6817f646d
treea00e6f3e011c63803933b48c7e797554fd420fee
parent3cb8921f74354a3a4aeaa932869acb7e6aabe630
parent2a4ac71ffbbc1c8f6d66cc4d1276ab1c8b7ae3d2
Merge gitk to pick up emergency build fix

  gitk: rename zh_CN.po to zh_cn.po
gitk-git/po/zh_cn.po