itsmattkc a487492842 fixed merge errors

2018-12-26 18:51:46 +11:00

..

effectcontrols.cpp

added it to effect controls

2018-12-26 18:27:12 +11:00

effectcontrols.h

implemented effect copying/pasting

2018-11-29 17:32:22 +11:00

effectcontrols.ui

added it to effect controls

2018-12-26 18:27:12 +11:00

panels.cpp

fixed a bunch of multithreaded loading issues and #174

2018-12-20 23:20:00 +11:00

panels.h

added setting for focus on hover for #161

2018-12-17 21:53:42 +11:00

project.cpp

Merge branch 'master' into resizablebars

2018-12-26 18:44:15 +11:00

project.h

completion of icon view

2018-12-25 01:10:20 +11:00

timeline.cpp

correct math in resizable scrollbars

2018-12-26 18:10:23 +11:00

timeline.h

correct math in resizable scrollbars

2018-12-26 18:10:23 +11:00

timeline.ui

implemented some resizable scroll bars

2018-12-24 02:15:37 +11:00

viewer.cpp

fixed merge errors

2018-12-26 18:51:46 +11:00

viewer.h

fixed merge errors

2018-12-26 18:51:46 +11:00

viewer.ui

Merge branch 'master' into resizablebars

2018-12-26 18:44:15 +11:00