diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 10:25:40 +0300 |
commit | 18d87e79e92e0cb4792ba3cb42c4ea84fcd29d90 (patch) | |
tree | b35fd8ad683c79a5cbd9f8419220ee1892cd9ef8 /source/blender/avi/intern/avi_intern.h | |
parent | 332548753008f941d920c8a9ee1079dbf1895d37 (diff) | |
parent | b3727668168075137f2ded11d7a7821548e4451d (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/avi/intern/avi_intern.h')
-rw-r--r-- | source/blender/avi/intern/avi_intern.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/avi/intern/avi_intern.h b/source/blender/avi/intern/avi_intern.h index b2fec1edfc1..6261b8140be 100644 --- a/source/blender/avi/intern/avi_intern.h +++ b/source/blender/avi/intern/avi_intern.h @@ -67,4 +67,3 @@ int avi_get_format_fcc(AviFormat format); int avi_get_format_compression(AviFormat format); #endif - |