resolved conflict state with HEAD r14096
[blender.git] / intern / string /
drwxr-xr-x   ..
-rw-r--r-- 1274 CMakeLists.txt
-rw-r--r-- 1882 Makefile
-rw-r--r-- 185 SConscript
-rw-r--r-- 4277 STR_HashedString.h
-rw-r--r-- 9116 STR_String.h
drwxr-xr-x - intern
drwxr-xr-x - make