diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-10 14:17:59 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-10 14:17:59 +0400 |
| commit | ac9ec06ec121589fedbfeaa10137140b45bfd668 (patch) | |
| tree | ab08f9528136f0b8813593b78621f869d98d655e /SConstruct | |
| parent | 3c064f4553e4be988fe4fcec450b59b935fa3c80 (diff) | |
| parent | 63af7068ad17f30a526ccb81fbe74253b064bc89 (diff) | |
Merged changes in the trunk up to revision 54421.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 70ada74cfa9..545805d4b63 100644 --- a/SConstruct +++ b/SConstruct @@ -592,6 +592,14 @@ data_to_c_simple("release/datafiles/matcaps/mc13.jpg") data_to_c_simple("release/datafiles/matcaps/mc14.jpg") data_to_c_simple("release/datafiles/matcaps/mc15.jpg") data_to_c_simple("release/datafiles/matcaps/mc16.jpg") +data_to_c_simple("release/datafiles/matcaps/mc17.jpg") +data_to_c_simple("release/datafiles/matcaps/mc18.jpg") +data_to_c_simple("release/datafiles/matcaps/mc19.jpg") +data_to_c_simple("release/datafiles/matcaps/mc20.jpg") +data_to_c_simple("release/datafiles/matcaps/mc21.jpg") +data_to_c_simple("release/datafiles/matcaps/mc22.jpg") +data_to_c_simple("release/datafiles/matcaps/mc23.jpg") +data_to_c_simple("release/datafiles/matcaps/mc24.jpg") ##### END DATAFILES ########## |