Merge branch 'delete-modify-conflict'
tree813209c3987fbbbe4d443259e70745a2e42c31bd
-rw-r--r-- 429 .gitignore
-rw-r--r-- 762 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 255 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 2878 build.txt
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 952 release.txt
drwxr-xr-x - src
drwxr-xr-x - test