summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-14 12:57:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-14 12:57:18 -0800
commit15c540fde9a72445c3ccfb6d81ce94ccf70b0016 (patch)
tree0f36ca58e4b721f36cdbc443cef69b7441e765fa /mergetools/tortoisemerge
parentMerge branch 'mh/war-on-extra-refs' (diff)
parentMakefile: introduce CHARSET_LIB to link with -lcharset (diff)
downloadtgif-15c540fde9a72445c3ccfb6d81ce94ccf70b0016.tar.xz
Merge branch 'dp/i18n-libcharset'
* dp/i18n-libcharset: Makefile: introduce CHARSET_LIB to link with -lcharset
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions