Merge branch 'master' into free-refcount-ids
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 6 Oct 2015 10:19:29 +0000 (12:19 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 6 Oct 2015 10:19:29 +0000 (12:19 +0200)
commit913938514d682990ea9b0aebf90574bfe96f43a8
tree547c7ab0ce92b4a089f582bdd881984dfe3d1247
parenta33cc08a99a173762c20c68a26a898f4da8f5708
parent359d1bd580c138c2b76b2afaed2a9069d5676707
Merge branch 'master' into free-refcount-ids
source/blender/blenkernel/BKE_font.h
source/blender/blenkernel/BKE_movieclip.h
source/blender/blenkernel/BKE_sound.h
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/sound.c
source/blender/makesrna/intern/rna_main_api.c