TortoiseMerge: Improve line margin icons (new icons are also suitable for High-DPI...
commitb9b124291788f2323edccd01b388606a7794ee30
authorSven Strickroth <email@cs-ware.de>
Fri, 12 May 2017 12:27:24 +0000 (12 14:27 +0200)
committerSven Strickroth <email@cs-ware.de>
Fri, 12 May 2017 12:27:24 +0000 (12 14:27 +0200)
tree54cc41d05ded246da12f17993e27d4f1e62498cf
parent94c9e3722446d5a081e723d82a25c79b3776212e
TortoiseMerge: Improve line margin icons (new icons are also suitable for High-DPI displays)

Based on TortoiseSVN rev. 27825.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
src/Resources/lineadded.ico
src/Resources/lineconflicted.ico
src/Resources/lineconflictedignored.ico
src/Resources/lineedited.ico
src/Resources/lineequal.ico
src/Resources/lineremoved.ico
src/Resources/linewhitespace.ico
src/TortoiseMerge/BaseView.cpp