resolved conflict state with HEAD r14096
[blender.git] / source / blender / avi /
drwxr-xr-x   ..
-rw-r--r-- 7675 AVI_avi.h
-rw-r--r-- 1366 CMakeLists.txt
-rw-r--r-- 1246 Makefile
-rw-r--r-- 263 SConscript
drwxr-xr-x - intern