sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
d433cd65f7
blender/source
History
Tamito Kajiyama d433cd65f7 Merged changes in the trunk up to revision 53146. 
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
2012-12-19 01:49:58 +00:00
..
blender Merged changes in the trunk up to revision 53146. 2012-12-19 01:49:58 +00:00
blenderplayer Merged changes in the trunk up to revision 53146. 2012-12-19 01:49:58 +00:00
creator Merged changes in the trunk up to revision 53146. 2012-12-19 01:49:58 +00:00
gameengine BGE: Some as of yet unmerged work I did in the Swiss branch. These changes include: 2012-12-18 20:56:25 +00:00
icons Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00
tests fix for another error in my own recent commit, beauty fill crashed. 2012-11-30 16:15:49 +00:00
CMakeLists.txt
SConscript Added GPL header to sconscripts! 2012-12-17 08:01:43 +00:00