Blender Git Commit Log

Git Commits -> Revision e701399

April 2, 2015, 13:20 (GMT)
Merge branch 'asset-experiments' into asset-engine

Conflicts:
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/filelist.h
source/blender/makesrna/intern/rna_internal.h

Notes:
* asset-experiments branch still needs some work (e.g. entires selection is to be reworked too),
but was more than time to do a first merge...
* This is raw merge, code is hence broken and needs more fixes to take into account new changes!

Commit Details:

Full Hash: e70139964d65d5908f61ec7350c8370e42ba995a
Parent Commits: 6ec52ce, a9f02fd

By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021