bb91cd
Merge branch 'master' of https://github.com/opentoonz/opentoonz # Conflicts: # toonz/sources/tnztools/brushtool.cpp # toonz/sources/tnztools/brushtool.h