Fixed issue #1065: Explorer crashes when rendering a file conflict icon
tree16929f5232c01f4ee505ae245322a818bc6cb56f
-rw-r--r-- 628 .gitignore
-rw-r--r-- 543 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3425 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 145 release.txt
drwxr-xr-x - src
drwxr-xr-x - test