]> git.parisson.com Git - telemeta.git/commit
Merge branch 'kdenlive' of git.parisson.com:git/telemeta into kdenlive
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 10 Jul 2019 14:09:16 +0000 (16:09 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 10 Jul 2019 14:09:16 +0000 (16:09 +0200)
commit148726dd1dd92d543efe461b8c96edfcf429c3d8
treed2b8352184dc05c6d08474929f7415ee5690a05b
parent0a0072adb5768bde51cc8085fe6c8ce55d88c69d
parent5fcc52198a6b4a7c2d55a51fd4419877e5263843
Merge branch 'kdenlive' of git.parisson.com:git/telemeta into kdenlive

Conflicts:
telemeta/util/kdenlive/session.py