sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
39,542 Commits 2 Branches 0 Tags 753 MiB
C++ 76%
Python 14.6%
C 5.2%
GLSL 1.8%
CMake 1.3%
Other 1%
8135cc9f95
Go to file
Tamito Kajiyama 8135cc9f95 Merged changes in the trunk up to revision 47700. 
Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h
2012-06-10 20:50:43 +00:00
build_files Merged changes in the trunk up to revision 47700. 2012-06-10 20:50:43 +00:00
doc Merged changes in the trunk up to revision 47700. 2012-06-10 20:50:43 +00:00
extern Commit patch from Stephan Kassemeyer sent to ML 2012-06-10 15:28:29 +00:00
intern Fix #31747, broken image sequence loading after r47432. 2012-06-10 07:35:45 +00:00
release Merged changes in the trunk up to revision 47700. 2012-06-10 20:50:43 +00:00
source Merged changes in the trunk up to revision 47700. 2012-06-10 20:50:43 +00:00
CMakeLists.txt Cmake: 2012-06-06 21:55:55 +00:00
COPYING == docs == 2010-10-13 14:44:22 +00:00
GNUmakefile cmake edits 2012-05-27 10:03:13 +00:00
SConstruct Scons: 2012-05-29 12:13:45 +00:00