forked from bartvdbraak/blender
c1ceab1281
Resolved conflicts: release/datafiles/startup.blend source/blender/editors/space_nla/nla_buttons.c Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of recent changes for the use of bool. |
||
---|---|---|
.. | ||
libmv | ||
patches | ||
third_party | ||
bundle.sh | ||
ChangeLog | ||
CMakeLists.txt | ||
files.txt | ||
libmv-capi.cpp | ||
libmv-capi.h | ||
mkfiles.sh | ||
SConscript |