test2

Files

Tamito Kajiyama 80e398e7b2 Merged changes in the trunk up to revision 41638.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

2011-11-08 06:30:02 +00:00

bin

SVN maintenance.

2011-10-25 13:44:35 +00:00

datafiles

Camera tracking integration

2011-11-07 12:55:18 +00:00

freedesktop

synched with trunk at revision 36569

2011-05-16 20:30:59 +00:00

plugins

Remove some more $Id$ that still were left after r41227 and r41228.