Merge branch 'dp/i18n-libcharset'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:18 +0000 (12:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Feb 2012 20:57:18 +0000 (12:57 -0800)
* dp/i18n-libcharset:
  Makefile: introduce CHARSET_LIB to link with -lcharset

1  2 
Makefile

diff --cc Makefile
Simple merge