Fixed issue #357: Fix line endings merging issue
treec47c6f1f185e5f6c7260fe97195aa984f803c8dc
-rw-r--r-- 388 .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
drwxr-xr-x - test