Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add doc example to tests #490

Merged
14 commits merged into from Mar 13, 2017
Merged

add doc example to tests #490

14 commits merged into from Mar 13, 2017

Commits on Apr 20, 2016

  1. Concatenate: set mask duration to clip duration

    v.paritskiy committed Apr 20, 2016
    Configuration menu
    Copy the full SHA
    409c7b3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from vparitskiy/fix-concatenate-mask-duration-p… 

    …atch-1

Concatenate: set mask duration to clip duration
    v.paritskiy committed Apr 20, 2016
    Configuration menu
    Copy the full SHA
    5068a66 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2017

  1. resolve merge concatenate

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    86c8672 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'vparitskiy-master'

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    f5905f6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:Zulko/moviepy

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    f2cf59c View commit details
    Browse the repository at this point in the history

  4. add matplotlib test

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    ba9c2d0 View commit details
    Browse the repository at this point in the history

  5. add python version test

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    87c07fe View commit details
    Browse the repository at this point in the history

  6. output display variable

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    7457c84 View commit details
    Browse the repository at this point in the history

  7. set matplotlib == 2.0.0 since 2.0.1 causes :0 error under python 3.5

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    3bbb4f3 View commit details
    Browse the repository at this point in the history

  8. in py 3.5 ignore matplotlib example

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    d7a5b82 View commit details
    Browse the repository at this point in the history

  9. fix version

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    5dc17a3 View commit details
    Browse the repository at this point in the history

  10. back out duration change

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    d5324c2 View commit details
    Browse the repository at this point in the history

  11. put changes back in

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    a7e01c3 View commit details
    Browse the repository at this point in the history

  12. remove :0 from .travis file

    @bearney74
    bearney74 committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    6d44a75 View commit details
    Browse the repository at this point in the history