merge with master and fix 4 conflicts by hand
[ardour.git] / libs / ardour / globals.cc
2014-06-02 Paul Davismerge with master and fix 4 conflicts by hand
2014-05-19 Colin FletcherMerge branch 'export-dialog' into cairocanvas
2014-05-10 John EmmasBug fix imported from Mixbus2 (SVN r11025)
2014-03-22 Paul DavisMerge ... master, primarily for adrian's maximise-mixer...
2014-03-09 Robin Gareus[VST] scan timeout display and per plugin timeout override.
2014-02-25 Robin Gareusoption to en/dis-able VST plugin discovery on startup
2014-02-25 Robin Gareusimplement plugin-scan cancel-button sensitivity
2014-02-24 Robin Gareusprepare GUI notifications for plugin scan
2014-02-12 Paul DavisMerge branch 'master' into cairocanvas
2014-02-08 Paul DavisMerge branch 'master' into cairocanvas
2014-02-08 Paul Davismerge with master, with minor conflict fixes
2014-02-04 Paul Davismerge (w/fix) with master
2014-01-30 Paul DavisMerge branch 'master' into cairocanvas
2014-01-29 Paul DavisMerge branch 'master' into cairocanvas
2014-01-23 Paul Davisfix merge conflict with master
2014-01-20 John EmmasMerge branch 'windows+cc' into cairocanvas
2014-01-19 Paul Davisvisibility macros and flush() added to SrcFileSource...
2014-01-17 Paul DavisMerge branch 'master' into cairocanvas
2014-01-17 Paul DavisMerge branch 'master' into cairocanvas
2014-01-16 Paul DavisMerge branch 'master' into cairocanvas
2014-01-16 Paul DavisMerge branch 'master' into cairocanvas
2014-01-16 Paul DavisMerge branch 'master' into cairocanvas
2014-01-15 Paul DavisMerge branch 'master' into cairocanvas
2014-01-15 Paul Davismerge with master
2014-01-15 Paul Davismerge with master
2014-01-14 Paul Davismerge (with conflict fixes) with master (even against...
2014-01-13 John EmmasMerge branch 'windows+cc' into cairocanvas
2014-01-13 John EmmasMerge branch 'windows+cc' into cairocanvas
2014-01-12 John EmmasMerge branch 'windows+cc' into cairocanvas
2014-01-11 Paul Davisfix merge with master
2014-01-10 Paul Davisfinished merge of cairocanvas with windows and windows...
2014-01-10 Paul DavisMerge windows+cc branch into cairocanvas branch. Not...
2014-01-10 Paul Davisfix merge errors with master
2014-01-08 Colin FletcherMerge remote-tracking branch 'origin/master' into expor...
2014-01-08 Paul DavisMerge branch 'master' into cairocanvas
2014-01-02 Paul DavisMerge branch 'master' into cairocanvas
2013-12-28 Paul DavisMerge branch 'master' into cairocanvas
2013-12-27 Paul Davismerge exportvis branch into cairocanvas, to reduce...
2013-12-23 Paul Davisfix redrawing of canvas with an optimized build
2013-12-12 Paul Davisfix merge conflicts from master
2013-12-05 Paul DavisMerge branch 'master' into cairocanvas
2013-12-04 Paul DavisMerge branch 'master' into windows
2013-12-03 Paul DavisMerge branch 'master' into windows
2013-11-30 Paul Davisfix merge with master
2013-11-30 Paul Davismerge and resolve conflict with master
2013-11-27 Paul DavisMerge branch 'master' into cairocanvas
2013-11-27 Paul DavisMerge branch 'master' into windows
2013-11-27 Paul DavisMerge branch 'master' into windows
2013-11-26 Paul DavisMerge branch 'master' into windows
2013-11-26 Paul Davisresolve merge with master (?)
2013-11-25 Paul DavisMerge branch 'master' into cairocanvas
2013-11-05 Paul Davistry to fix various warnings from gcc when optimization...
2013-10-23 Paul Davisfix merge conflicts with master
2013-10-18 John EmmasMerge remote-tracking branch 'remotes/origin/exportvis...
2013-10-17 Paul Davismerge with master and fix 2 conflicts
2013-10-17 Paul DavisMerge branch 'master' into windows
2013-10-16 John EmmasMerge remote-tracking branch 'remotes/origin/master...
2013-10-15 Paul DavisMerge branch 'master' into windows
2013-10-14 John EmmasMerge branch 'master' into windows+cc
2013-10-11 John EmmasMerge branch 'windows' into windows+cc
2013-10-09 Paul DavisMerge ... master, fixing conflicts in 3 wscript files
2013-10-08 Paul Davischange return type on ARDOUR::cleanup() since nobody...
2013-10-06 John EmmasMerge branch 'master' into windows+cc
2013-09-25 John EmmasMerge branch 'cairocanvas' into windows+cc
2013-09-21 John EmmasMerge remote-tracking branch 'remotes/origin/cairocanva...
2013-09-20 Paul DavisMerge branch 'master' of https://github.com/nmains...
2013-09-19 Paul Davisswitch from JACK_Slave to Engine_Slave
2013-09-18 John Emmas'libs/ardour' - Further platform specific changes
2013-09-18 Paul DavisMerge branch 'master' into windows
2013-09-17 Paul Davisfix conflicts and merge with master
2013-09-14 Paul Davisfix merge conflicts with master
2013-09-14 Paul DavisMerge branch 'master' into windows
2013-09-14 Paul DavisMerge branch 'master' into windows
2013-09-13 Paul DavisMerge branch 'master' into windows
2013-09-13 Paul DavisMerge branch 'master' into windows
2013-09-12 Paul Davismerge with master
2013-09-12 Paul Davisincomplete merge of master into windows (requires upcom...
2013-09-06 Paul Davisfix merge conflicts with audioengine
2013-09-06 Paul DavisMerge branch 'master' into windows
2013-09-06 Tim MayberryRename SearchPath class Searchpath
2013-09-03 Paul DavisMerge branch 'master' into audioengine
2013-09-03 Paul DavisMerge branch 'master' into windows
2013-09-03 Paul DavisMerge branch 'master' into windows
2013-08-24 Paul Davisfix merge conflicts from master
2013-08-14 Paul DavisMerge branch 'master' into cairocanvas
2013-08-14 Paul Davisfix merge issues with master
2013-08-14 Paul Davisprovide clock_gettime() implementation for lovely OSX...
2013-08-13 Tim MayberryCall Gio::init from PBD::init instead of ARDOUR::init
2013-08-13 Tim MayberryCall PBD::init in ARDOUR::init and PBD::cleanup in...
2013-08-13 Tim MayberryPrevent libardour from being initialized more than...
2013-08-13 Tim MayberryChange ARDOUR::init return type to bool type for succes...
2013-08-09 Paul DavisMerge branch 'master' into audioengine
2013-08-09 Paul Davisremove use of jack_get_time() from ARDOUR::get_microsec...
2013-08-08 Paul Davismajor redesign of MIDI port heirarchy and management...
2013-08-06 John EmmasMerge branch 'windows' of git.ardour.org:ardour/ardour...
2013-08-05 Paul Davisfix conflicts after merge with master
2013-08-04 John Emmas'libs/ardour' - Platform specific changes and includes
2013-08-04 John Emmas'libs/ardour' - Main body of changes required for build...
2013-08-03 Paul Davisadd tim's jack_utils code to rationalize setup of JACK...
2013-08-03 Paul Davisaudioengine branch can now load and run at least one...
next