Fixed issue #292: Very large dialog when merging
tree7afe9a19416eed4a9e905c23b354b6bc10afe5fb
-rw-r--r-- 372 .gitignore
-rw-r--r-- 391 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3557 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
drwxr-xr-x - src