sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
39,035 Commits 2 Branches 0 Tags 753 MiB
C++ 76%
Python 14.6%
C 5.2%
GLSL 1.8%
CMake 1.3%
Other 1%
a5152b7ca0
Go to file
Tamito Kajiyama a5152b7ca0 Merged changes in the trunk up to revision 46787. 
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
2012-05-19 08:40:56 +00:00
build_files Merged changes in the trunk up to revision 46787. 2012-05-19 08:40:56 +00:00
doc Merged changes in the trunk up to revision 46309. 2012-05-05 11:40:42 +00:00
extern Make blender compilable by gcc-4.7 and strict compilation flags: 2012-05-14 13:31:38 +00:00
intern style cleanup: ghost/x11 2012-05-18 20:13:40 +00:00
release Merged changes in the trunk up to revision 46787. 2012-05-19 08:40:56 +00:00
source Merged changes in the trunk up to revision 46787. 2012-05-19 08:40:56 +00:00
CMakeLists.txt attempt to fix osx build error 2012-05-17 14:00:54 +00:00
COPYING == docs == 2010-10-13 14:44:22 +00:00
GNUmakefile style cleanup: imbuf & icons 2012-05-13 22:05:51 +00:00
SConstruct Add pthread dll for MinGW64 during installation. Now people who download from buildbot will be able to run the build even without MinGW-w64 installed. 2012-05-01 20:57:39 +00:00