Merge remote-tracking branch 'origin/2.4' into merge-2.4
[profile/ivi/opencv.git] / .tgitconfig
1 [tgit]
2     icon = doc/opencv.ico