Merge branch 'js/runtime-prefix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:34 +0000 (15:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:34 +0000 (15:59 +0900)
* js/runtime-prefix:
  Avoid multiple PREFIX definitions
  git_setup_gettext: plug memory leak
  gettext: avoid initialization if the locale dir is not present

1  2 
Makefile
exec-cmd.c
gettext.c

diff --cc Makefile
Simple merge
diff --cc exec-cmd.c
Simple merge
diff --cc gettext.c
Simple merge