kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
b35a893249
blender/intern
History
Tamito Kajiyama ac9ec06ec1 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
2013-02-10 10:17:59 +00:00
..
audaspace Patch #33837: ffmpeg1.1 and libav9.1 compatibility update 2013-01-12 12:51:10 +00:00
bsp Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
container Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
cycles Merged changes in the trunk up to revision 54421. 2013-02-10 10:17:59 +00:00
dualcon Add missing virtual destructor for VirtualMemoryAllocator 2013-01-20 15:36:32 +00:00
elbeem Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
ffmpeg Further tweaks to support libav from wheezy 2013-01-13 17:54:09 +00:00
ghost building ghost-sdl works again. 2013-02-08 08:02:05 +00:00
guardedalloc Windows compile fix: 2013-01-27 15:12:52 +00:00
iksolver Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
itasc Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
locale Python i18n API. Many thanks to Campbell and Brecht for the reviews and suggestions! 2013-01-20 17:29:07 +00:00
memutil Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
mikktspace Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
moto Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
opencl Move opencl and reigidbody from source/blender/ to intern/ 2013-02-01 06:24:49 +00:00
opencolorio Style cleanup in OCIO area 2013-01-08 20:55:07 +00:00
opennl Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
raskter Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
rigidbody rigidbody: Code cleanup 2013-02-05 21:51:18 +00:00
smoke style cleanup 2013-02-04 00:05:15 +00:00
string Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
utfconv Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
CMakeLists.txt Move opencl and reigidbody from source/blender/ to intern/ 2013-02-01 06:24:49 +00:00
SConscript Move opencl and reigidbody from source/blender/ to intern/ 2013-02-01 06:24:49 +00:00