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/makesdna/DNA_packedFile_types.h | |
| parent | 332548753008f941d920c8a9ee1079dbf1895d37 (diff) | |
| parent | b3727668168075137f2ded11d7a7821548e4451d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_packedFile_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_packedFile_types.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_packedFile_types.h b/source/blender/makesdna/DNA_packedFile_types.h index 00a54c2db7f..d2e0dd92cbc 100644 --- a/source/blender/makesdna/DNA_packedFile_types.h +++ b/source/blender/makesdna/DNA_packedFile_types.h @@ -57,5 +57,3 @@ enum ePF_FileStatus { }; #endif /* PACKEDFILE_TYPES_H */ - - |