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)
commit15c540fde9a72445c3ccfb6d81ce94ccf70b0016
tree0f36ca58e4b721f36cdbc443cef69b7441e765fa
parentd31f3785dcc10459540e2e185b6e25363f719256
parentb5225286b226759262c0637058528af03226fba6
Merge branch 'dp/i18n-libcharset'

* dp/i18n-libcharset:
  Makefile: introduce CHARSET_LIB to link with -lcharset
Makefile