fix merge conflicts from master
[ardour.git] / gtk2_ardour / video_image_frame.cc
2013-08-24 Paul Davisfix merge conflicts from master
2013-08-03 Robin Gareusdedicated namespace for video-utils
2013-08-02 Paul DavisMerge branch 'master' into windows
2013-08-01 Paul DavisMerge branch 'master' into windows
2013-08-01 Paul DavisMerge branch 'master' into windows
2013-08-01 Paul Davisfix merge conflict from master
2013-07-31 John EmmasMerge branch 'windows' of git.ardour.org:ardour/ardour...
2013-07-22 Tim MayberryUse GLib::usleep for portability
2013-06-14 Robin GareusNOOP clean up code
2013-05-05 Paul Davisthe big rework of window management. probably not compl...
2013-04-11 Robin Gareusenable videotimeline by default
2013-04-10 Robin Gareusvtl: remove inadvertently committed CURLERRORDEBUG
2013-03-29 Paul DavisMerge branch 'patches' of https://github.com/jdekozak...
2013-03-26 Robin Gareusfix typo in prev commit
2013-03-26 Robin Gareusvtl: increase retry timeout on 503, print http status...
2013-03-19 Paul DavisMerge branch 'master' of git.ardour.org:ardour/ardour
2013-03-18 Robin Gareusvtl: re-request frame on 503/try-again
2013-03-13 Robin Gareusvideotimline