resolved conflict state with HEAD r14096
[blender.git] / extern / verse /
drwxr-xr-x   ..
-rw-r--r-- 1156 CMakeLists.txt
-rw-r--r-- 1923 Makefile
drwxr-xr-x - dist
drwxr-xr-x - make