fixed conflict
[python-gstreamer-examples] / example1.py
2017-06-02 Einar Jørgen Haral... fixed conflict
2017-06-02 Einar Jørgen Haral... Lots of patches to work with most recent python3/GTK/Gst
2015-05-10 Einar Jørgen Haral... Use GTK3 GObject instead of GTK2 gobject
2014-06-18 Einar Jørgen Haral... Dropped unnecessary includes
2014-06-18 Einar Jørgen Haral... First commit, progress so far