Rebased changes made on nab_features_2016 after merge

shotgunsoftware / tk-multi-importcut

Import Cut app

Other

0 stars 0 forks source link

Rebased changes made on nab_features_2016 after merge #27

Closed sgsteph closed 8 years ago

sgsteph commented 8 years ago

Generated a patch from master, starting after 29cc3d10995761f559717ec2f84e26c77b35fbac (dialog resize commit ) And applied those changes here to have a clean pull request showing only real changes.

raphaelmatto commented 8 years ago

This PR contains code for tickets #35629, #35625, #35631—added code to support skip button, added head/tail trim note to CutItem description, and we're now ignoring Cut order changes. There is also restored code in here related to Versions that is mostly inactive. I'm working in another branch now to finish that, so you may find some missing pieces. Hopefully this is the last time we'll have code from one branch "polluting" the PR for other features.