Include CC only if necessary

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Include Message-ID in email

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Dropped unused code

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Deduplicate code

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed issue #1839: Conflict dialog does not allow resolving multiple or all conflicts with the same option

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Update build.txt

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed typo

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed typo

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Small code cleanup

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Make CProgressDlg::KillProcessTree() public

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Kill running command line process when closing Sync Dialog

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Show wait cursor while loading Repository Browser

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Added GPL headers

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Updated Tortoise.pot

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Moved MAPI settings to settings dialog

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Drop unused parameter

Signed-off-by: Sven Strickroth <email@cs-ware.de>
TortoiseGitMerge: Slow check at the end is only needed if the fast part didn't find any non-ANSI chars

Based on TortoiseSVN revision 24553

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
TortoiseGitMerge: Handle utf-16 files that don't have a BOM

Also update TortoiseGitBlame which relies on the enum defined in TortoiseGitMerge

Based on TortoiseSVN revision 24555

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Allow to configure and use mail relay server

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Some further cleanup

Signed-off-by: Sven Strickroth <email@cs-ware.de>