git.slaskete.net / python-gstreamer-examples / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 578b34c b54b187)
fixed conflict
authorEinar Jørgen Haraldseid <einar@haraldseid.net>
Fri, 2 Jun 2017 20:13:33 +0000 (22:13 +0200)
committerEinar Jørgen Haraldseid <einar@haraldseid.net>
Fri, 2 Jun 2017 20:13:33 +0000 (22:13 +0200)

Trivial merge
Python/GStreamer examples